Start on Bootstrap 3 migration
Revert "Start on Bootstrap 2 migration"

This reverts commit cac6e61a75d2ac014051e0cc351d6a0c07a4e66a.
Start on Bootstrap 3 migration
Revert "Start on Bootstrap 3 migration"

This reverts commit 29ea2b81c7703da205fbaa464cd25e4ccb5dfb41.
Merge remote-tracking branch 'origin/master' into bootstrap