-
Merge remote-tracking branch 'origin/master'

Conflicts:
	BoxSyncTest/bin/classes/org/ubicollab/android/boxsynctest/CreateCommunityActivity$1.class