prepare client side socket.io
Initial Submodule add
websocket in dev
upgrade dorfmap-websockets
Merge branch 'master' of github.com:chaosdorf/dorfmap into sockets

Conflicts:
	public/js/dorfmap.min.js
	src/js/overview-angular.js
lamp in real time!
fix socket server
I forgot compiled version :(
fix merge problems
Option to disable sockets
Merge remote-tracking branch 'origin/sockets'

Conflicts:
	src/js/overview-angular.js