Merge branch 'hotfix/0.9.11'

* hotfix/0.9.11:
  * Rails 3.2.17 * Updated gems
Merge branch 'release/0.10.0'

* release/0.10.0:
  Updated gems
  * Using spring instead of spork * Updated gems * Using around filters to set locale and timezone
Updated gems
Merge branch 'hotfix/0.10.1' into develop

* hotfix/0.10.1:
  Updated gems