Merge branch 'hotfix/0.0.24'
Updated Rails to 3.2.11
Merge branch 'hotfix/0.0.25' into develop