commit
Merge branch 'master' of http://github.com/mprat/meet-django-demo