#314 Update to Bootstrap 3.0.2
Merge branch 'version2.0' into version2.1