Re-generate assets
Merge branch 'upgrade' into staging
Re-generate assets
upgrade rails to 3.2.12 && and json to 1.7.7