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
Merge branch 'release/1.13.2'

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