fix logging and cleanup
Merge pull request #2 from SuperTux88/cleanup

fix logging and cleanup
Merge pull request #3 from fbe/master

refactoring und json controller
websockets
Merge branch 'master' into websocket

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

Websocket
fix compile error
Merge pull request #5 from SuperTux88/websocket

fix compile error
map scroll fun fun fun