add base map
git ignore
lol
Merge branch 'android-master' of https://github.com/vayan/11Meal into android-master

Conflicts:
	res/menu/main.xml
	res/values/strings.xml