# Conflicts:
#	pyKADMOS/scripts/AGILE_EY01_DEMO.py
#	pyKADMOS/scripts/sellarProblem.py

adjusted .gitignore to ignore .idea files according to http://stackoverflow.com/questions/11968531/what-to-gitignore-from-the-idea-folder

Set up project structure according to the one indicated in the README. Sellar and AGILE demos should be working; changed the initialization of the MDOproblem instance, specifically how the path to the indicated  knowledge base directory is determined.

Fixed MDOproblem Class so that example cases work; separated the original MDOproblem class completely from the "new" one

Fixed MDOproblem Class so that example cases work; separated the original MDOproblem class completely from the "new" one

# Conflicts:
#	.idea/workspace.xml
#	pyKADMOS/AGILE_EY01_DEMO.py
#	pyKADMOS/MDOproblem.pyc
#	pyKADMOS/MDOstatic.pyc

Merge branch 'CPACS_MCG__Andreas' of https://bitbucket.org/imcovangent/kadmos into CPACS_MCG__Andreas

Conflicts:
	.gitignore
	.idea/workspace.xml
	pyKADMOS/AGILE_EY01_DEMO.py
	pyKADMOS/AGILE_EY01_DEMO_big.log
	pyKADMOS/AGILE_EY01_DEMO_big.pdf
	pyKADMOS/AGILE_EY01_DEMO_small.log
	pyKADMOS/AGILE_EY01_DEMO_small.pdf
	pyKADMOS/MDOproblem.py
	pyKADMOS/MDOproblem.pyc
	pyKADMOS/MDOstatic.pyc
	pyKADMOS/XDSM_writer/__init__.pyc

finished class method that adds KB graphs to MDOproblem-instance; added helper functions that create edge-tuples and add node attributes; created new class MDPgraph that serves as super-class for other graph classes (MCG, FPG, PSG); added graph-contraction method to super class; added Graph-subclass MCG; added method that generates graph object for the MCG

Merge branch 'CPACS_MCG__Andreas' of https://bitbucket.org/imcovangent/kadmos into CPACS_MCG__Andreas

# Conflicts:
#	.idea/workspace.xml
#	pyKADMOS/sellarProblem.py

resolves #23 (PSG for MDF with Jacobi)

created _get_function_graph() that build graphs using self.functionData using helper functions _create_edge_tuples() and _add_node_attribs()[in progress]

Added a line that will trigger the file validation only when "KB_CPACS" is used as KB, so that other examples work flawlessly

# Conflicts:
#	.idea/workspace.xml

Conflicts:
	.gitignore
	.idea/workspace.xml
	pyKADMOS/MDOexport.pyc
	pyKADMOS/MDOproblem.py
	pyKADMOS/MDOproblem.pyc
	pyKADMOS/MDOstatic.pyc
	pyKADMOS/MDOvisualization.pyc
	pyKADMOS/__init__.pyc