Fix
Merge branch 'master' of https://github.com/Springsteen/Watch1t

Conflicts:
	app/views/users/user_panel.html.erb
Merge branch 'master' of https://github.com/Springsteen/Watch1t
Fix