Merge pull request #802 from jay-hodgson/release-27

change UserBadge back to table implementation, but override bootstrap bo...