Merge remote-tracking branch 'origin/SviluppoCarlo' into provvisorio2
prova commit
commit
Merge remote-tracking branch 'origin/SviluppoCarlo' into provvisorio

Conflicts:
	src/main/resources/database_model_write/WanagProgetti.hbm.xml
commit salva dati su db
conflict
Merge remote-tracking branch 'origin/provvisorio' into SviluppoCarlo

Conflicts:
	src/main/java/com/ddway/mip/utility/WrapperFormToDb.java
	src/main/java/com/ddway/mip/web/ProvaController.java