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

Conflicts:
	application/views/partials/sidebar.php
	assets/javascripts/app.js