Merge origin/master

Conflicts:
	Ippocrate-ejb/src/java/Controller/GestorePrenotazione.java
Merge origin/master

Conflicts:
	Ippocrate-ejb/src/java/Controller/GestoreMedico.java
Merge origin/master

Conflicts:
	Ippocrate-ejb/src/java/Controller/GestoreMedico.java
Integrazione google calendar