#279 Upgrade to bootstrap 3.2.0
Merge branch 'issue_279' into develop