almost finished associations
Merge branch 'master' of github.com:fschmidt/se

Conflicts:
	Beuth_HS_MD_M_SE_AT_Uebung1_Petrasch_Generator/bin/Beuth_HS_MD_M_SE_AT_Uebung1_Petrasch_Generator/files/generateECore2Java.emtl
	Beuth_HS_MD_M_SE_AT_Uebung1_Petrasch_Generator/bin/Beuth_HS_MD_M_SE_AT_Uebung1_Petrasch_Generator/files/generateECore2Java.mtl
	Beuth_HS_MD_M_SE_AT_Uebung1_Petrasch_Generator/src/Beuth_HS_MD_M_SE_AT_Uebung1_Petrasch_Generator/files/generateECore2Java.mtl
	de.bht.se.exercise01.app/model/exercise01.ecore
	de.bht.se.exercise01.app/model/exercise01.ecorediag
	de.bht.se.exercise01.generator/bin/de/bht/se/exercise01/generator/generateECore2Java.emtl