Merge branch 'release-0.2.0' into develop
Security update: Upgrade Rails to 3.2.11
Bump version to 0.2.1
Merge branch 'release-0.2.1'