Merge branch 'master' of github.com:open-steam/webarena
Merge branch 'develop'
Bid Connector can now speak https with bid servers
fix
no message
switch to express
fix - context was missing
refectory error handling
- code-styling
- use promises
provide ids in url
some small improvements
not needed
problems when combining JS library files - reverse for the moment
fix missing context
switch to new "image magick" version - old leads to errors under OS X
perhaps depends on system image magick version
not needed for the moment
add "toast" library
Merge branch 'develop' into feature/webserver
Merge branch 'develop' into feature/webserver
catch errors during undo