aggiustamenti alle quicklist
Risolto merge di vari file
Merge origin/master

Conflicts:
	Ippocrate-ejb/src/java/Controller/GestoreLogin.java
	Ippocrate-ejb/src/java/Controller/GestoreLoginLocal.java
	Ippocrate-war/src/java/web/LoginServlet.java
	Ippocrate-war/web/errore.jsp
	Ippocrate-war/web/home-paziente.jsp
	Ippocrate-war/web/index.html
	Ippocrate-war/web/login.jsp
Merge origin/master