logo
Merge remote-tracking branch 'origin/master'

Conflicts:
	Community+/bin/classes/edu/mit/aiti/CommunityPlus/R$id.class
	Community+/bin/classes/edu/mit/aiti/CommunityPlus/R$layout.class
	Community+/bin/classes/edu/mit/aiti/CommunityPlus/R$menu.class
	Community+/bin/classes/edu/mit/aiti/CommunityPlus/R$string.class
	Community+/bin/classes/edu/mit/aiti/CommunityPlus/R$style.class
	Community+/gen/edu/mit/aiti/CommunityPlus/R.java
	Community+/res/values/strings.xml