OverallView
Merge branch 'master' of https://github.com/panida/locationPredicting

Conflicts:
	app/routes.php