instabilità
Merge branch 'master' of https://github.com/GiulioGx/Jama.git

Conflicts:
	Jama/src/main/java/controllerLayer/AgreementListPageControllerBean.java