Version bump to Bootstrap 3.1
Merge branch 'bootstrap-3.1'