Unificacion 130109
gestion de pwd
Merge branch 'master' of https://github.com/certae/ProtoExt

Conflicts:
	db/testproto.db
	src/protoLib/localisation/en.py
	src/protoLib/localisation/es.py
	src/protoLib/protoLogin.py
	static/js/UI/ConfigController.js
	static/js/UI/FormController.js
	static/js/UI/GridController.js
	static/js/UI/GridSheetController.js
	static/js/UI/MDActionsController.js
	static/js/UI/MDDetailsController.js
	static/js/UI/MDSetSortersController.js
	static/js/UI/MDSetTabsController.js
	static/js/UI/MDTbSortByController.js
	static/js/UI/TbMasterDetail.js
	static/js/globals/variables.js
	static/js/view/MenuTree.js
	static/js/view/ProtoGrid.js