Merge branch 'hotfix/0.15.1'

* hotfix/0.15.1:
  * Ruby 2.1.3 * Updated gems
Merge branch 'release/0.17.0'

* release/0.17.0: (23 commits)
  * Rails 4 * Turbolinks progress bar * Updated gems
  moved all .js.coffee files to .coffee Turbolinks progress bar Updated gems
  ALL F*IN SPECS PASS!
  Removed DeLorean in favour of travel_to
  Updated gems
  Fixed facebook data cacher spec
  Fixed itineraries spec
  Fixed messages and references Improved factories Fixed conversations helper
  Fixed configuration
  Updated csv initializer
  Updated gems Workaround for mongoid/mongoid#3767
  fixed issue caused by sprockets
  * Basic currency customization (Closes #27) * Removed unneeded locale settings * Updated gems
  Updated gems Using jc-validate_timeliness which better supports Rails 4
  fixed conflict
  Added back client side validations but it still doesn’t work
  updated gems
  updated gems
  Fixed authentication
  Disabled client side validations
  ...
Merge branch 'release/0.18.0'

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

* hotfix/0.18.1:
  * Rails 4.1.7 * Updated gems