report page
Merge remote-tracking branch 'origin/master'
Google maps is working!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project-1/build.gradle
	Project-1/src/main/AndroidManifest.xml
	Project-1/src/main/res/layout/activity_main.xml
	Project-1/src/main/res/layout/activity_report.xml
Google maps!
Google maps!