Merge origin/bootstrap3 and fix conflicts
WIP on bringing native bootstrap popovers back