update files
Merge branch 'master' of https://github.com/RappLabs/Brinker-Millennial

Conflicts:
	app/routes.php