upgrade rails to 3.2.12
Merge remote-tracking branch 'origin/develop' into develop