Merge branch 'hotfix/11.1.3'

* hotfix/11.1.3:
  * Updated gems
Merge branch 'release/12.0.0'

* release/12.0.0: (23 commits)
  updated gems
  Ruby 2.2.0 Final edits for Rails 4.2 config Updated gems
  Fixed gemfile Updated gems (waiting for a new version of slim-rails)
  fixed slim template
  * Changed brand primary color to MARSALA PANTONE 18-1438 (Pantone of the Year 2015)
  Updated gems
  removed deprecated .css.scss
  fixed travis version to 2.1.5 Rails 4.2.0.rc3
  Ruby 2.1.5 Updated gems
  updated gems [ci skip]
  updated gems bumped up version updated changelog fixed turbolinks progress bar style
  updated config files
  rails 4.2.0.rc2
  improved slim template
  updated config files
  updated gems
  Removed the slim prettifier because of uniformity between development and production layout (whitespaces)
  Indent html for pretty debugging and do not sort attributes
  Added back html extension to slim templates improved slim templates
  fixed gemfile
  ...
* Updated gems
Merge branch 'hotfix/12.0.1' into develop

* hotfix/12.0.1:
  * Updated gems