Preparacion Merge
Settings separation
form optimisation
modif preov
Django1.6
Merge branch 'master' of github.com:certae/ProtoExt

Conflicts:
	src/ProtoExt/settings.py
	static/metaDefinition/pciObjects.js
Modif ....
Tests unitaires
Merge branch 'master' of https://github.com/certae/ProtoExt into Django1.6.1

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	db/testproto.db
	src/ProtoExt/settings.py
	src/ProtoExt/settings_development.py
	src/ProtoExt/settings_production.py
	src/ProtoExt/urls.py
	src/alltests/SampleProtoListRequest.json
	src/alltests/__init__.py
	src/alltests/fixtures/admin.json
	src/alltests/fixtures/auth.json
	src/alltests/fixtures/auth_permission.json
	src/alltests/fixtures/auth_user.json
	src/alltests/fixtures/auth_user_tableinfo.txt
	src/alltests/fixtures/protoLib.json
	src/alltests/fixtures/prototype.json
	src/alltests/models.py
	src/alltests/testMetaDefinitions/MetaObjects.dat
	src/alltests/testMetaDefinitions/MetaProperties.dat
	src/alltests/testMetaDefinitions/ObjectsTest.py
	src/alltests/testMetaDefinitions/PropertiesTest.py
	src/alltests/testMetaDefinitions/__init__.py
	src/alltests/testSample0/SampleTest.py
	src/alltests/testSample0/__init__.py
	src/alltests/testSampleProject/ViewCreationTest.py
	src/alltests/testSampleProject/__init__.py
	src/alltests/tests.py
	src/alltests/views.py
	src/ll/models.py
	src/protoLib/fields.py
	src/protoLib/localisation/es.py
	src/protoLib/management/__init__.py
	src/protoLib/models.py
	src/protoLib/protoActionEdit.py
	src/protoLib/protoActionList.py
	src/protoLib/protoActions.py
	src/protoLib/testprotoLib/.directory
	src/protoLib/testprotoLib/ModelsTest.py
	src/protoLib/testprotoLib/ProtoActionEditTest.py
	src/protoLib/testprotoLib/ProtoActionListTest.py
	src/protoLib/testprotoLib/ProtoActionRepTest.py
	src/protoLib/testprotoLib/ProtoActionsTest.py
	src/protoLib/testprotoLib/ProtoAuthTest.py
	src/protoLib/testprotoLib/ProtoGetDetailsTest.py
	src/protoLib/testprotoLib/ProtoGetPciTest.py
	src/protoLib/testprotoLib/ProtoLoginTest.py
	src/protoLib/testprotoLib/ProtoMenuTest.py
	src/protoLib/testprotoLib/__init__.py
	src/protoLib/utilsBase.py
	src/prototype/testprototype/.directory
	src/prototype/testprototype/ProtoRulesTest.py
	src/prototype/testprototype/Utils.py
	src/prototype/testprototype/__init__.py
	src/prototype/testprototype/testactions/ViewDefinitionTest.py
	src/prototype/testprototype/testactions/ViewTemplateTest.py
	src/prototype/testprototype/testactions/__init__.py
	src/prototype/testprototype/testmodels/DiagramEntityTest.py
	src/prototype/testprototype/testmodels/DiagramTest.py
	src/prototype/testprototype/testmodels/EntityTest.py
	src/prototype/testprototype/testmodels/ModelTest.py
	src/prototype/testprototype/testmodels/ProjectTest.py
	src/prototype/testprototype/testmodels/PropertyBaseTest.py
	src/prototype/testprototype/testmodels/PropertyEquivalenceTest.py
	src/prototype/testprototype/testmodels/PropertyModelTest.py
	src/prototype/testprototype/testmodels/PropertyTest.py
	src/prototype/testprototype/testmodels/ProtoTableTest.py
	src/prototype/testprototype/testmodels/PrototypeTest.py
	src/prototype/testprototype/testmodels/RelationshipTest.py
	src/prototype/testprototype/testmodels/ServiceRefTest.py
	src/prototype/testprototype/testmodels/ServiceTest.py
	src/prototype/testprototype/testmodels/TestSuiteUtils.py
	src/prototype/testprototype/testmodels/TestUtilities.py
	src/prototype/testprototype/testmodels/__init__.py
	static/js/UI/ConfigController.js
	static/js/UI/FormController.js
	static/js/UI/MDActionsController.js
	static/js/UI/MDDetailsController.js
	static/js/UI/MDPrintOptsController.js
	static/js/UI/MDSetFiltersController.js
	static/js/UI/MDSetSortersController.js
	static/js/UI/MDSetTabsController.js
	static/js/UI/MDTbSortByController.js
	static/js/app.js
	static/js/globals/ProtoStore.js
	static/js/globals/variables.js
	static/js/ux/FieldHtmlEditor.js
	static/js/ux/GridCheckColumn.js
	static/js/ux/GridHeaderToolTip.js
	static/js/ux/HelpQbe.js
	static/js/ux/HtmlSet.js
	static/js/ux/ParameterWin.js
	static/js/ux/Printer.js
	static/js/ux/ProtoList.js
	static/js/ux/ProtoProperty.js
	static/js/ux/ProtoQBE.js
	static/js/ux/ProtoZoom.js
	static/js/view/MenuTree.js
	static/js/view/ProtoGrid.js
	templates/protoExt.html