Merge commit '99d1e774af05d5992327fc187b9f74480da781e5' into devs

Conflicts:
	CrimeZone/CrimeZone/src/main/java/com/ppl/crimezone/activities/ReportController.java
	CrimeZone/CrimeZone/src/main/res/layout/home_map_ui.xml
Merge branch 'devs' of https://github.com/pplc01/crimezone into devs
+ fixing merging process
+ fixing report form ui