DONE - admin/user functions
Merge branch 'master' of https://github.com/kevcal69/ssco_mbl.git

Conflicts:
	assets/javascripts/app.js