working django
fixed django

Merge branch 'master' of http://github.com/meet-projects/meetconnection