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

Conflicts:

	build/web/WEB-INF/classes/com/dai/dao/JogadorEquipaAdversariaDaoImpl.class
	nbproject/project.properties
tt
Merge branch 'teste' of https://github.com/DAI2014/SpringJDBCTemplate into teste

Conflicts:
	build/web/WEB-INF/classes/com/dai/dao/TreinoDaoImpl.class