Settings update
Merge branch 'Django1.6.1' of https://github.com/victorette/ProtoExt into Django1.6.1