Minor locator adjustment
Debug mode added
Small fixes
clean up
Merge branch 'master' into Cahue

Conflicts:
	CahueAndroid.iml
	app/app.iml
	app/src/main/java/com/bahpps/cahue/MapsActivity.java
	app/src/main/res/values/strings.xml
clean up