Merge branch 'hotfix/1.1.1'
Update rails to 3.2.11
Merge branch 'hotfix/1.1.2' into develop