BS3 update
Merge pull request #738 from sexnothing/bootstrap3

BS3 update