activitiy list interface structure completed
Merge branch 'master' of github.com:ztao/d-e

Conflicts:
	bin/DiabetesElsewhere.apk
	bin/classes.dex
	bin/classes/com/appspot/diabeteselsewhere/R$id.class
	bin/classes/com/appspot/diabeteselsewhere/R$layout.class
	bin/classes/com/appspot/diabeteselsewhere/R$menu.class
	bin/classes/com/appspot/diabeteselsewhere/R$string.class
	bin/classes/com/appspot/diabeteselsewhere/R$style.class
	bin/classes/com/appspot/diabeteselsewhere/activity/ActivitiesPagerActivity$1.class
	bin/classes/com/appspot/diabeteselsewhere/activity/ActivitiesPagerActivity.class
	bin/classes/com/appspot/diabeteselsewhere/activity/EventScheduleActivity.class
	bin/classes/com/appspot/diabeteselsewhere/adapter/ActivitiesPagerAdapter.class
	bin/classes/com/appspot/diabeteselsewhere/adapter/EventListAdapter.class
	bin/classes/com/appspot/diabeteselsewhere/fragment/navdrawer/ActivityListFragment.class
	bin/classes/com/appspot/diabeteselsewhere/fragment/navdrawer/EventFragment.class
	bin/classes/com/appspot/diabeteselsewhere/fragment/navdrawer/SubscribeFragment.class
	bin/resources.ap_
	gen/com/appspot/diabeteselsewhere/R.java
	res/layout/fragment_pager.xml
	res/values/strings.xml
	src/com/appspot/diabeteselsewhere/activity/ActivitiesPagerActivity.java
	src/com/appspot/diabeteselsewhere/adapter/ActivitiesPagerAdapter.java
	src/com/appspot/diabeteselsewhere/fragment/navdrawer/ActivityListFragment.java
fix my wrong use of git, lol