- rails_12 factor gem for heroku deployment
Merge remote-tracking branch 'origin/develop'