Update to Bootstrap 3.2
Merge remote-tracking branch 'upstream/master'
Merge pull request #838 from oliverds/master

Update to Bootstrap 3.2.0