Merge branch 'master' of
https://github.com/CommunityPlus/CommPlus_v3.git

Conflicts:
	bin/Community+.apk
	bin/classes.dex
	bin/classes/edu/mit/aiti/CommunityPlus/BaseActivity.class
	bin/classes/edu/mit/aiti/CommunityPlus/HomeItemDetailFragment.class
	bin/classes/edu/mit/aiti/CommunityPlus/HomeItemListActivity.class
	bin/classes/edu/mit/aiti/CommunityPlus/R$id.class
	bin/classes/edu/mit/aiti/CommunityPlus/R$layout.class
	bin/classes/edu/mit/aiti/CommunityPlus/R$menu.class
	bin/classes/edu/mit/aiti/CommunityPlus/R$string.class
	bin/classes/edu/mit/aiti/CommunityPlus/R$style.class
	bin/classes/edu/mit/aiti/CommunityPlus/adapter/EventAdapter.class
	bin/resources.ap_
	gen/edu/mit/aiti/CommunityPlus/R.java
	res/layout/activity_homeitem_detail.xml
	res/layout/home_list_events.xml
	res/values/strings.xml
	src/edu/mit/aiti/CommunityPlus/adapter/EventAdapter.java