#196 upgrade to bootstrap 3.1.1
Merge branch 'issue_196' into develop