Update Bootstrap 3.3.1
Merge remote-tracking branch 'origin/dev'