Upgrade rails to 3.2.12
Fix conflicts