remove mockups. if you need them, just checkout an older version
Merge branch 'master' into chat
merge chat client code into django, initial logic for chat server