Update MapActivity
Merge branch 'master' of https://github.com/Hatem-tmi/GpsTracker

Conflicts:
	project.properties
	res/values/strings.xml
	src/com/example/gpstracker/activity/MapActivity.java