Implemented multiple channels
Merge branch 'master' of github.com:TN1ck/aal

Conflicts:
	aal/public/angular/app/scripts/services/textinput.service.js
	aal/public/angular/app/scripts/services/websocket.service.js
Pairing works now
Merge branch 'master' of github.com:TN1ck/aal
Added placeholders