BS3 update
Merge pull request #740 from sexnothing/bootstrap3

BS3 update