Merge branch 'release/10.1.0' into develop

* release/10.1.0:
  * Bootstrap for sass 3.3.0 * Updated gems
Merge branch 'hotfix/10.1.1' into develop

* hotfix/10.1.1:
  * Rails 4.1.7 * Updated gems
Merge branch 'hotfix/10.1.2' into develop

* hotfix/10.1.2:
  * Ruby 2.1.4
Merge branch 'hotfix/10.1.3' into develop

* hotfix/10.1.3:
  Updated gems
Merge branch 'hotfix/10.1.4' into develop

* hotfix/10.1.4:
  * Fixed travis config
Merge branch 'hotfix/10.1.5' into develop

* hotfix/10.1.5:
  * Fixed index
* Added haml-rails gem
* Updated gems
Updated gems
* Updated version to 11.0.0
* Added quiet_assets gem
* Removed delorean gem
* Updated gems
updated gems
Merge branch 'release/11.0.0'

* release/11.0.0:
  updated gems
  * Updated version to 11.0.0 * Added quiet_assets gem * Removed delorean gem * Updated gems
  Updated gems
  * Updated gems
  * Added haml-rails gem
fixed conflicts