Merge branch 'release/3.1.0' into develop

* release/3.1.0:
  * Bootstrap 3.1.0 * Updated gems * Reformatted changelog * Updated Bootstrap license to MIT
Merge branch 'hotfix/3.1.1' into develop

* hotfix/3.1.1:
  * Updated gems
moved to sass
fixed conflicts
Bumped up major version number
Updated readme
Merge branch 'release/4.0.0'

* release/4.0.0:
  Bumped up major version number Updated readme
  moved to sass