OPEN - task 46: Vehicles,Speed,Employee,Alert,Activity Report 
http://github.com/antareja/surabi/issues/issue/46
Merge branch 'master' of https://github.com/antareja/surabi.git

Conflicts:
	application/views/map/region.php
	application/views/report/vehicle.php
	assets/js/map.js