Merge branch 'release-1.0.1' into develop
Merge branch 'hotfix/v1.0.2' into develop
Merge branch 'hotfix/v1.0.3' into develop
[#21] Upgrade to Rails 3.2.11, also upgrading gems.

Ensure that the latest Rails security patches are applied.
Merge branch 'enhancement/21-upgrade-rails' into develop
Bump version to v1.0.4.
Merge branch 'release/v1.0.4'