silence validator regarding http-equiv="X-UA-Compatible"
Merge branch 'master' of https://github.com/twbs/bootstrap into develop
Merge branch 'develop' into gh-pages