Switch to Bootstrap 3.0
Merge branch 'dev'