fixes
Merge branch 'django_socketio' of github.com:poseidon4o/pp into django_socketio