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

Conflicts:
	SpringJDBCTemplate/src/com/dai/controller/JogoController.java