updt
Merge branches 'master' and 'master' of https://github.com/chhama/GroundWater

Conflicts:
	app/controllers/MapController.php
	app/views/home/index.blade.php
mapp
Merge branch 'master' of https://github.com/chhama/GroundWater

Conflicts:
	app/views/home/index.blade.php