adding more code for add current and external locations
Merge branch 'master' of https://github.com/drmaas/mobile

Conflicts:
	FavoritePlaces/src/edu/umn/kill9/places/activity/CurrentLocationActivity.java