Merge origin/master and fix conflicts, bring new components up to date with bootstrap 3