Merge branch 'hotfix/3.0.2'

* hotfix/3.0.2:
  * Updated gems
Merge branch 'release/3.1.0'

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

* hotfix/3.1.1:
  * Updated gems