Updated bootstrap to version 3.0.2
Merge branch 'updatebootstrap' into develop