Added websockets and support for displaying a cursor
Merge branch 'master' of github.com:TN1ck/aal

Conflicts:
	aal/public/angular/app/scripts/websockets.js
	aal/public/angular/app/styles/main.css
Merge branch 'master' of github.com:TN1ck/aal