Improved Websockets. Multiple Listeners now possible
Merge branch 'master' of github.com:TN1ck/aal

Conflicts:
	aal/public/angular/app/views/templates/widget.personal.html