maps
Merge remote-tracking branch 'origin' into akash
commit
deleted
Some fixes
Merge branch 'vasanthy' of https://github.com/vasanthykolluri/TrackABuddy into contactSettingScreen
Merge branch 'akash' of https://github.com/vasanthykolluri/TrackABuddy into contactSettingScreen

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/TrackABuddy.apk
	bin/classes.dex
	bin/classes/com/codepath/apps/trackabuddy/BuddyArrayAdapter.class
	bin/classes/com/codepath/apps/trackabuddy/MainActivity$1.class
	bin/classes/com/codepath/apps/trackabuddy/MainActivity.class
	bin/classes/com/codepath/apps/trackabuddy/fragments/BuddyListFragment.class
	bin/resources.ap_
	gen/com/codepath/apps/trackabuddy/BuildConfig.java
	gen/com/codepath/apps/trackabuddy/Manifest.java
	gen/com/codepath/apps/trackabuddy/R.java
	res/layout/activity_main.xml
	src/com/codepath/apps/trackabuddy/MainActivity.java
	src/com/codepath/apps/trackabuddy/ShowPopUp.java
	src/com/codepath/apps/trackabuddy/fragments/BuddyListFragment.java