made compatible with new comfy sofa that uses bootstrap-sass ~> 3.2
Merge branch 'danielmyasnikov-bump-bootstrap-sass'