samuel
merge
Merge branch 'teste' of https://github.com/DAI2014/SpringJDBCTemplate into teste

Conflicts:
	SpringJDBCTemplate/WebContent/WEB-INF/jsp/listarJogosTA.jsp
	build/web/WEB-INF/classes/com/dai/controller/JogoController.class
	build/web/WEB-INF/classes/com/dai/dao/EstatisticaDaoImpl.class
	build/web/WEB-INF/classes/com/dai/jdbc/UtilizadorExtractor.class
	build/web/WEB-INF/jsp/listarJogosTA.jsp
	build/web/WEB-INF/jsp/registarUtilizador.jsp
	build/web/resources/css/register.css
	nbproject/project.properties