commit
Merge remote-tracking branch 'origin/ProvvisorioCarloNew2013' into
provvisorioGiovanni

Conflicts:
	src/main/webapp/WEB-INF/views/selezione_cup.jsp