commit
commit
commit
commit
commit
commit
commit
commit
Bug Sistema Crediti fixed.
commit
commit
commit
commit
Merge branch 'master' into giorgio
Merge branch 'master' into giorgio
Merge branch 'branch-br1-tmp'

Conflicts - RESOLVED:
	src/main/java/ai/server/controller/LoginController.java
	src/main/webapp/WEB-INF/views/login.jsp
Working in progress sulla paina di inserzione con gestione del JS
BugFix
Porve di registrazione, da android, non riuscite