Merge branch 'release/1.0.5' into develop
only delete columns after migrating the data
Merge branch 'develop' of github.com:praekelt/django-moderator