google map v1.0
map ver2
Merge branch 'googleMap' into develop

* googleMap:
  map ver2
  google map v1.0

Conflicts:
	MOPCON_APP/src/main/AndroidManifest.xml
integrate #2