django-postman
Merge branches 'dev' and 'django-postman' of github.com:xHFT/pencilme-dev into django-postman
add delete button for messages
merge the other branch
fix the conflict
merge dev branch
Fixed url conflict
Merge pull request #20 from xHFT/django-postman

django-postman