Test4
Merge remote-tracking branch 'origin/master'

Conflicts:
	Community+/bin/classes/edu/mit/aiti/CommunityPlus/SignIn.class
test5