Merge branch 'dev'
added rails_12factor gem
Merge branch 'master' into dev