changes to amient dynamix
Hibernate altered  Demon registration altered
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/WebService/.idea/workspace.xml