Merge branch 'hotfix/0.5.1'
Merge branch 'release/0.6.0'
added rails_12factor gem
Merge branch 'hotfix/0.6.1' into develop