prova A4
Merge branch 'master' of
https://github.com/andrear2/Nostro-progetto-A2LS.git

Conflicts:
	PoliBox/src/main/java/it/polito/ai/polibox/controller/AccountController.java