Badges and specialty points backbone
Merge remote-tracking branch 'upstream/master'