Take some of the suck out of the chat interface
Merge branch 'master' into messenger

Conflicts:
	public/p-components/mini-chat.html (related to selectedTarget)
Fixed up indentation on mini-chat.html
Merge branch 'master' into messenger
More mini-chat indentation fixes
Merge branch 'master' into messenger
Show only channels in subscription dropdown.