Fix to deploy bug
Bootstrap 3.1.1 (16px)
Fix #280
Merge branch 'stable'