Begin reworking gamification interface, referenced in #237
Merge remote-tracking branch 'origin/develop' into develop