reverting bootstrap to clean, repairing CSS otherwise
Merge branch 'develop' into staging