Merge branch 'feature/issue-8-base-django-setup' into develop
Merge branch 'develop' of github.com:praekelt/oneorg into develop