mc changes
Merge remote-tracking branch 'origin/master'

Conflicts resolved:
	app/routes.php
	js/pages/home.js
routes n home