Actualizar datos en la BBDD si son válidos - Configurar Projecto
Merge origin/develop into develop

Conflicts:
	src/main/java/eui/miw/pfm/controllers/beans/ConfProjectBean.java
	src/test/java/eui/miw/pfm/controllers/beans/TestConfProjectBean.java
Merge origin/develop into develop

Conflicts:
	src/main/java/eui/miw/pfm/controllers/beans/ConfProjectBean.java
	src/test/java/eui/miw/pfm/controllers/beans/TestConfProjectBean.java