Merge origin/master and fix conflicts, update various widgets to comply with Bootstrap 3 syntax
Fix qunit error