aa
merge
Merge remote-tracking branch 'origin/teste' into teste

Conflicts:
	SpringJDBCTemplate/src/com/dai/controller/JogoController.java
	build/web/WEB-INF/classes/com/dai/controller/JogoController.class
	build/web/WEB-INF/classes/com/dai/controller/UtilizadorController.class