try bootstrap 3, stick in 2, refactor bootstrap js
Merge branch 'dev' into version
0.1.48