BS3 update
Merge pull request #739 from sexnothing/bootstrap3

BS3 update