25 years
25
Hotfix for an error where deleted objects reappeared later
Fixed getContentAsString which did not work when prefetchen content already was a string
Merge branch 'develop' into feature/ResponsivePositioning

* develop: (22 commits)
  solve the bug with moving objects without pressing a mouse key
  Change the actionsheet from horizontal to vertical menu structure
  delete an old config file on server side (probably debris from a bachelor thesis merge)
  Exit-Object: add possibility to create a new subroom (restored commit)
  clean up some code (restored commit)
  *changed name parent to environment
  *added new error logger
  Exit-Object: add possibility to create a new subroom
  clean up some code
  add placeActiveObjectsAsync
  Add getOverlappingObjectsAsync
  Async fix for the exit object
  Some etherpad fixes and preparations
  another link bugfix
  Add undo button
  links: solve the wrong rendering order which occurs when a new object is created
  link bugfix
  inform other clients about link changes
  Typo fix
  change the duplication of objects (async and link improvements)
  ...

Conflicts:
	package.json
	source/Client/ObjectManager.js
	source/objects/Base/1.GeneralObject/client.js
	source/objects/Base/1.GeneralObject/server.js
	source/objects/Base/3.Room/server.js
Merge branch 'feature/ResponsivePositioning' into thesis/evaluationLogic

* feature/ResponsivePositioning:
  solve the bug with moving objects without pressing a mouse key
  Change the actionsheet from horizontal to vertical menu structure
  delete an old config file on server side (probably debris from a bachelor thesis merge)
  Exit-Object: add possibility to create a new subroom (restored commit)
  clean up some code (restored commit)
  *changed name parent to environment
  *added new error logger
  Exit-Object: add possibility to create a new subroom
  clean up some code
  Fixed getContentAsString which did not work when prefetchen content already was a string
  Hotfix for an error where deleted objects reappeared later
  25
  25 years

Conflicts:
	package.json
	source/Client/ObjectManager.js
	source/Client/guis.common/javascript/1.toolbar.js
	source/Server/BuildTool.js
	source/error/error.log
	source/objects/Base/1.GeneralObject/client.js
	source/objects/Base/1.GeneralObject/server.js
	source/objects/Base/3.Room/server.js
	source/server.js
Merge branch 'thesis/evaluationLogic' of https://github.com/open-steam/webarena into thesis/evaluationLogic

# Via Christoph Sens
* 'thesis/evaluationLogic' of https://github.com/open-steam/webarena:

Conflicts:
	package.json
	source/Client/ObjectManager.js
	source/Client/guis.common/javascript/1.toolbar.js
	source/Server/BuildTool.js
	source/error/error.log
	source/server.js