Merge branch 'development'
change deploy config for prod
Merge branch 'development'
rails 3.2.15
Merge branch 'development'
Merge branch 'master' into whatyou