Implemented websockets. New graphic motor.
Merge remote-tracking branch 'origin/websockets'

Conflicts:
	app/js/main.js