Per adaptar al nou Dev3
Merge branch 'master' of github.com:mydocumenta/installacionspedagogiques

Conflicts:
	admin/utils/dbAccess.php
	gestor/utils/dbAccess.php