Merge with master and solve Bootstrap 3 board issues