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

Conflicts:
	build/web/WEB-INF/classes/com/dai/controller/JogoController.class
	build/web/WEB-INF/classes/com/dai/controller/TreinoController.class