change import django.utils.simplejson to import json for Django1.6
and change Path for json.loads(open())
.settings
modifications de mes droits
tests unitaires
Merge branch 'Django1.6.1' of https://github.com/victorette/ProtoExt into origin/Django1.6.1

Conflicts:
	db/testproto.db
	src/alltests/testMetaDefinitions/ObjectsTest.py
	src/alltests/testMetaDefinitions/PropertiesTest.py
	src/alltests/tests.py
	src/protoLib/utils/xml2json.py
	src/prototype/testprototype/ProtoRulesTest.py
	src/prototype/testprototype/testmodels/TestSuiteUtils.py
Test