commit test
Remove test
Almost final version.
Files for the CollText object type
Co-authoring Szenario implementiert + refactoring
Refactoring.
Final version.
Merge branch 'develop' into collTextEditor

* develop: (377 commits)
  Little formatting changes for a better merging I hope.
  Some code refactoring.
  Lines and Arrows can be created by selecting startpoint and endpoint
  Added D3 library and removed link to online version of D3.
  Quick and dirty fix to make WebArena work in new versions of socket.io. Proper namespaces need to be put into place.
  small usability updates for the exit object
  small bugfixes for the object creation
  change the creation of objects: Instead of showing them in the top left corner the user can set a self-chosen position by clicking on the canvas
  Further small fixes for the directed links
  Some changes. Bug fixing and clean up.
  A lot of changes, most of them implements new objects for the mobile version.
  some fixes for the directed links
  Add more properties to the directed links + minor fixes
  Cleanup room code
  Fixed an error, where object handling crashed when objects had connections to nonexisting objects
  Fixed config issues in WebServer
  all the old behaviour of invisible objects to the new directed links + other small fixes
  Minor fix
  add directed links
  Added comments to the config file
  ...

Conflicts:
	source/Client/ObjectManager.js
	source/Client/guis.common/javascript/1.toolbar.js
Configuration attributes