Fixed unnecessary margin on button group buttons

Buttons in groups in bootstrap are styled to touch on inside edges to
appear joined, so should not have a 5 px margin between them.
Merge pull request #2610 from etryn/develop

Fixed unnecessary margin on button group buttons