Merge branch 'release/0.18.0' into develop

* release/0.18.0:
  * Bootstrap 3.3.0 * Updated gems
Merge branch 'hotfix/0.18.1' into develop

* hotfix/0.18.1:
  * Rails 4.1.7 * Updated gems
Merge branch 'hotfix/0.18.2' into develop

* hotfix/0.18.2:
  updated changelog
  * Ruby 2.1.4
Merge branch 'hotfix/0.18.3' into develop

* hotfix/0.18.3:
  Fixed specs to work with webmock 1.20.4
  Updated gems
Merge branch 'hotfix/0.18.4' into develop

* hotfix/0.18.4:
  * Updated gems
Merge branch 'hotfix/0.18.5' into develop

* hotfix/0.18.5:
  * Rails 4.1.8 * Updated gems * Fixed version number
Merge branch 'hotfix/0.18.6' into develop

* hotfix/0.18.6:
  * Updated gems * Fixed alerts
Merge branch 'hotfix/0.18.7' into develop

* hotfix/0.18.7:
  * Updated gems
Rails 4.2.0.rc1
Fixed spec
fixed facebook cacher specs
Converting templates to slim
added back html extension to slim templates
fixed templates
fixed all specs
Fixed itinerary thumbnail
Indent html for pretty debugging and do not sort attributes
Updated gems
Updated gems
Removed the slim prettifier because of uniformity between development and production layout (whitespaces)
More fixes to slim templates
updated gems
fixed merge conflicts