Update Bootstrap to 3.2
Merge branch 'dev'