Update bootstrap to version 3.1.1
Merge pull request #984 from sexnothing/develop

Update bootstrap to version 3.1.1