revert
Merge branch 'master' of github.com:conanfanli/django_appengine