Adding ability to determine whether user is staff or client
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/planetexpress/nimbus/activities/ChallengeSetup.java
Merge branch 'master' of https://github.com/algard/Nimbus