Support bootstrap 3.1
Merge branch 'dev'