Merge branch 'release/1.0'
Update to rails 3.2.12
Merge branch 'hotfix/1.0.1' into develop