Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop

Add association to badge and badge_set