#525 Update Bootstrap to version 3.1
Merge branch 'master' into version3.0