introducing type id's for making things maintainable
introducing type id's for making things maintainable - Bugfix
Merge branch 'master' of 192.168.2.2:/share/devel/git/morphium

Conflicts:
	pom.xml