Merge branch 'master' into Sharon

Conflicts:
	app/controllers/HomeController.php
	app/routes.php
fixed login and logout so both function and are on the splashScreen navbar
Merge pull request #19 from blind-squirrel/Sharon

Sharon
Merge branch 'master' into Sharon