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
Merge pull request #20 from blind-squirrel/Sharon

Sharon
starting on register page
Merge pull request #21 from blind-squirrel/Sharon

starting on register page
Merge branch 'master' into alex
Fixed formatting issue on the splash screen and about page
Updated user controller to implement RemindableInterface