synchronized with repository
Merge branch 'master' of github.com:lalo73/django-chat