coupling update
some bugfixes
coupling update
small bugfix
some bugfixes
adding mousewheel scrolling
adding config parameter
Merge remote-tracking branch 'remotes/origin/develop' into feature/coupling

Conflicts:
	source/Client/ObjectManager.js
	source/Client/config.default.js
	source/Client/guis/desktop/index.html
	source/Client/guis/desktop/style.css
	source/Server/ObjectManager.js
	source/objects/2.ActiveObject/view.js
	source/objects/3.Exit/common.js
	source/objects/6.Subroom/common.js
merge fix
bugfix: duplicate and zoom
more fluid moving of objects between rooms
room hierarchy respects reading rights now
Merge remote-tracking branch 'remotes/origin/develop' into feature/coupling

Conflicts:
	.gitignore
	source/Server/FileConnector.js
	source/Server/ObjectManager.js
	source/Server/UserManager.js
	source/objects/3.Exit/common.js