Django1.6
Merge branch 'master' of github.com:certae/ProtoExt

Conflicts:
	src/ProtoExt/settings.py
	static/metaDefinition/pciObjects.js