big cleanup
Merge branch 'master' of https://www.github.com/AlexanderRothkegel/Conedy

Conflicts:
	containerNode.h