Merge branch 'dev'
updated production config
added application settings
latest
added rails12factor gem
solved merge conflict
Merge branch 'dev'
solved merge conflict
Merge branch 'master' into dev