added the possibility to create a serverroom and put in there the
serverracks
fixed conflict
test commit
test commit
test commit
Merge branch 'master' of https://github.com/fujaba/BeAST.git

Conflicts:
	de.uks.beast.editor/src/de/uks/beast/editor/diagram/EditorFeatureProvider.java