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

Conflicts:
	build/web/WEB-INF/classes/com/dai/dao/TreinoDaoImpl.class
cc
merge
Merge branch 'teste' of https://github.com/DAI2014/SpringJDBCTemplate into teste

Conflicts:
	build/web/WEB-INF/classes/com/dai/dao/JogoDaoImpl.class
	build/web/WEB-INF/classes/com/dai/dao/UtilizadorDaoImpl.class
	build/web/WEB-INF/classes/com/dai/jdbc/JogoExtractor.class
	nbproject/private/private.properties
	nbproject/project.properties