v11
Merge branch 'master' of https://github.com/LDavixL/CampusCompete

Conflicts:
	C/www/js/index_user_scripts.js
	appmobilauncher.html
	appmobilauncher.js
	js/index_user_scripts.js
s
color