Turned a CBV in userpanel into a FBV to make things simpler
Merge branch 'master' of github.com:CS192-Felizmenio/RRS

Conflicts:
	login/views.pyc
	rrs.db
	rrs/settings.pyc
	rrs/urls.pyc
	userpanel/views.pyc

Merging local repo to master repo