Map
Map new version
Merge branch 'map'

Conflicts:
	AndroidManifest.xml
	res/layout/main.xml
	res/values/strings.xml
	src/com/spongesoft/dietapp/MainActivity.java