Websockets as a service now. Working :)
Merge branch 'master' of github.com:TN1ck/aal

Conflicts:
	aal/public/angular/app/index.html
	aal/public/angular/app/scripts/directives/widget.calendar.js