AMPL components
Merge branch 'master' of https://github.com/lunkpeter/MarketAnalysisTemp

Conflicts:
	hu.viking.cooptpxsystem.datamodel.output/xtend-gen/hu/viking/cooptpxsystem/datamodel/output/TXTOutputGeneratorForTestDatas.java
	hu.viking.cooptpxsystem.datamodel/model/datamodel.ecorediag
Merge branch 'master' of https://github.com/lunkpeter/MarketAnalysisTemp