merged websocket-api.md into api.md
Merge branch 'sjmpc.py' into collection
fixed: inconsistent order of message handlers
documented current API calls / events
updated jQuery; added ES6-Promise
added ConfigurationError (client); implemented utility functions send, isArray, createSet (client)
refactored initialization (asynchronous, steps) (client); implemented loadConfig (client); split configuration to server, display and remote
made shebang cross-platform compatible
Merge pull request #122 from krmnn/master

make shebang cross-platform compatible
added HTMLImports
removed client brick information from Brick; moved maintainer from Brick to module level
implemented load promise wrapper
implemented loading of bricks via HTML imports; added html attribute to Brick
ported URL and Photo brick to HTML component architecture
moved dynamic loading of stylesheets in display post template to client side
disabled Pyng
Merge branch 'master' into client-config
cleaned up
Merge pull request #127 from NoyaInRain/client-config

Client config
Merge branch 'master' into import-brick

Conflicts:
	README.md
	wall/res/static/util.js