No Changes

Binary Files Differ
No Changes

Trying to pull down new things but have some conflicts.
Merge branch 'wiring_groups_pages'
No Changes

Binary Files Differ
Starter Map Files

Added the starter files and maps api.
More Maps

Map files updated with some logic. Should be close to working but
emulator doesn't support the google play services. This can only be
tested on an android device. Followed a pretty good tutorial here:
http://www.androidhive.info/2013/08/android-working-with-google-maps-v2/
Got the map working
Merge branch 'Map-Activity'

Conflicts:
	Grouper_Proj/bin/Grouper.apk
	Grouper_Proj/bin/classes.dex
	Grouper_Proj/bin/classes/com/example/grouper/GroupViewActivity.class
	Grouper_Proj/bin/classes/com/example/grouper/MainActivity.class
	Grouper_Proj/bin/classes/com/example/grouper/R$id.class
	Grouper_Proj/bin/classes/com/example/grouper/R$layout.class
	Grouper_Proj/bin/classes/com/example/grouper/R$menu.class
	Grouper_Proj/bin/classes/com/example/grouper/R$string.class
	Grouper_Proj/bin/classes/com/example/grouper/R$style.class
	Grouper_Proj/bin/classes/com/example/grouper/SearchableActivity$1.class
	Grouper_Proj/bin/classes/com/example/grouper/SearchableActivity.class
	Grouper_Proj/bin/classes/com/example/grouper/TodoActivity$1.class
	Grouper_Proj/bin/classes/com/example/grouper/TodoActivity.class
	Grouper_Proj/bin/resources.ap_
	Grouper_Proj/gen/com/example/grouper/R.java
	Grouper_Proj/res/values/strings.xml