home template
Merge branch 'master' of https://github.com/rvdimarco/gruppo1.git

Conflicts:
	annunciG1/WebContent/WEB-INF/struts-config.xml
	annunciG1/build/classes/applicationContext.xml
	annunciG1/src/applicationContext.xml
	annunciG1/src/it/geek/annunci/service/ServiceFactory.java