TEST TRANSACTION
merge and resolved file conflict
resolve conflict
Merge pull request #4 from francarl/master

Creazione facade per tipologica
Enti
commit ricerca prov
menu
Merge branch 'master' of https://github.com/TeamBig/MonProvv
merge
Merge branch 'master' of https://github.com/TeamBig/MonProvv/

Conflicts:
	MonProvvWeb/src/main/webapp/template/template.jsp
merge
Merge pull request #5 from francarl/master

Aggiunta nuove entity
provvedimenti ricerca popolute
Gestione Enti
Ricerca Organi

Merge branch 'master' of https://github.com/TeamBig/MonProvv

Conflicts:
	MonProvvModel/src/main/java/it/tesoro/monprovv/model/Organo.java
	MonProvvWeb/src/main/webapp/WEB-INF/monprovv-servlet.xml
ricerca provvedimenti
Provvedimenti + Property Editor
Gestione Enti
Gestione Enti Merge branch 'master' of
https://github.com/TeamBig/MonProvv

Conflicts:
	MonProvvWeb/src/main/java/it/tesoro/monprovv/web/utils/StringUtils.java
Gestione Enti