fixes
Merge branch 'master' of github.com:torchbox/design-in-browser-bootstrap