Merge branch 'master' of https://github.com/Norgerman/Reserve

Conflicts:
	app/routes.php