#192 Update to Bootstrap 3.0.1
Merge branch 'version2.0' into version2.1