admin
Merge branch 'sidebar' of https://github.com/kevcal69/ssco_mbl.git into sidebar

Conflicts:
	application/controllers/admin_functions/module.php
	application/controllers/admin_functions/question.php
	application/controllers/admin_functions/test.php
	application/controllers/admin_functions/user.php
	application/helpers/output_text_helper.php
	application/views/admin/home.php
	application/views/admin/test_result.php
	assets/css/template.css
	assets/javascripts/app.js
template css fix