Locations.
Ignore
Merge branch 'master' of https://github.com/gdg-team/Tellme

Conflicts:
	src/com/gdgteam/tellme/android/activity/MainMapActivity.java