erase
Revert "erase"

This reverts commit d06c432f281ebeb992b0436a5289fa8926d0b2bd.

Conflicts:
	gpsarapp/src/main/res/values/strings.xml
test
GoogleMaps Activity changed. (mark DB's latlng point)

Conflicts:
	gpsarapp/src/main/AndroidManifest.xml
	gpsarapp/src/main/java/com/example/hiroto/gpsarapp/MapsActivity.java
Merge branch 'master' of https://github.com/katsuobushiFPGA/ARApp

Conflicts:
	gpsarapp/src/main/AndroidManifest.xml