started changes to migrate to Bootstrap 3 (work in progress)
Merge remote-tracking branch 'origin/bootstrap-3'