Settings
Merge branch 'android-master' of https://github.com/vayan/11Meal into android-master

Conflicts:
	AndroidManifest.xml
	project.properties
	res/values/strings.xml