more stuffs
Merge remote-tracking branch 'origin/master'

Conflicts:

	app/src/main/java/planetexpress/nimbus/activities/ChallengeRosterActivity.java