maps update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/junglesoft/traffictracker/MapsActivity.java
geofence update