Merge branch 'release/v0.5' into develop
Updated production settings, wsgi
Merge branch 'develop'