rails_12factor added to gemfile
Merge branch 'develop'