Merge pull request #13 from victorette/master

Django and Extjs upgrade
Merge test GioVict
Merge branch 'master' of https://github.com/certae/ProtoExt into extjs_test
Merge upstream