Dynamic channel.
Merge remote-tracking branch 'remotes/WorkingRepo/master'

Conflicts:
	youtune/api/static/api/js/controllers.js
	youtune/api/static/api/templates/partial/settings_avatar.html
Merge.