More fixing to use Boostrap 2.1.0
Merge branch 'release/release_0.1.0' into production