Testing commit
MasterOfDissaster

frontend
registration
channel
jquerryUI
Merge remote-tracking branch 'remotes/origin/master' into MasterOfDissaster

Conflicts:
	youtune/api/static/api/js/controllers.js
	youtune/api/static/api/templates/index.html
	youtune/api/static/api/templates/registration.html
	youtune/api/templates/api/base.html
ConflictResolve

jup
Merge pull request #9 from Irrialite/MasterOfDissaster

Master of dissaster