Added channels, styling, some safeguards and checks.
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/directives.js
	tickr.html