Updated bootstrap (2.3.0) and html5boilerplate (4.1.0)
Merge