Merge branch 'master' of github.com:open-steam/webarena
Merge branch 'develop'
Bid Connector can now speak https with bid servers
fix
no message
Merge branch 'release/1.13.1'

Conflicts:
	source/Server/BidAPI.js
	source/Server/BidConnector.js
Fixed display of uncaught exception
Text object
On the hunt for a bug where object content is empty on update
Debug testing
Removed debug code
- Error where content was empty on update should be solved now
- Fixed error, where getRoom function could not find the current room, resulting in strange behaviour for reactive objects. This is just a quick hack. Further improvements are needed.
Removed false repainting attempts on the room
Removed the test object
Ignoring test object for checkin
Merge branch 'release/1.13.2'

Conflicts:
	source/server.js
nonsense
nonsense
add
Merge branch 'hotfix/1.13.2-1' into develop
nonsense