TipoLogEvento ok
prob default
Merge remote-tracking branch 'origin/master'

Conflicts:
	SGIA/web/src/main/webapp/WEB-INF/templates/default.xhtml