text review
Merge branch 'develop' of https://github.com/entpy/entpy-django-website into develop