Edited tests for userpanel
Merge branch 'master' of https://github.com/CS192-Felizmenio/RRS

Conflicts:
	rrs/settings.pyc