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

Conflicts:
	SpringJDBCTemplate/WebContent/resources/include/templateAnalistas.jsp
	SpringJDBCTemplate/WebContent/resources/include/templateAtleta.jsp
	SpringJDBCTemplate/WebContent/resources/include/templateSeccionista.jsp
	SpringJDBCTemplate/WebContent/resources/include/templateTreinadorAdjunto.jsp
	build/web/WEB-INF/classes/com/dai/controller/JogoController.class
	build/web/WEB-INF/classes/com/dai/controller/TreinoController.class
	build/web/WEB-INF/classes/com/dai/controller/UtilizadorController.class
	build/web/resources/include/templateAnalistas.jsp
	build/web/resources/include/templateAtleta.jsp
	build/web/resources/include/templateOlheiros.jsp
	build/web/resources/include/templateSeccionista.jsp
	build/web/resources/include/templateTreinador.jsp
	build/web/resources/include/templateTreinadorAdjunto.jsp