dummy map + gps
Merge branch 'android-master' of https://github.com/vayan/11Meal into android-master

Conflicts:
	res/values/strings.xml
	src/com/vaya/elevenMeal/API.java
	src/com/vaya/elevenMeal/LoginActivity.java