commit
Merge branch 'master' into giorgio
commit
Merge branch 'master' into giorgio

Conflicts:
	src/main/java/ai/server/controller/InserzioneController.java
commit
c
Merge branch 'master' into giorgio

Conflicts:
	src/main/java/ai/server/controller/InserzioneController.java
commit
commit
Merge branch 'master' into giorgio

Conflicts:
	src/main/java/ai/server/controller/AndroidValutazioneController.java
commit
commit
commit
commit
commit
c
commit
commit
c
c