commit
Merge branch 'master' of https://github.com/CELAR/c-Eclipse.git

Conflicts:
	core/eu.celar.infosystem.mockup/src/eu/celar/infosystem/mockup/info/MockUpInfoSystem.java