Misc
Merge branch 'master' of https://github.com/webxmedia/10kmiles

Conflicts:
	app/routes.php