- User schedule now available
Merge branch 'master' of https://github.com/Codeopolis/Ass1st

Conflicts:
	application/controllers/pages.php
	application/views/pages/user_profile.php
	style/bootstrap/css/main.css