websockets
Merge branch 'master' into websocket

Conflicts:
	conf/routes
Merge pull request #4 from SuperTux88/websocket

Websocket