Muitas Ateracoes
conflito
c2
Merge remote-tracking branch 'origin/teste' into teste

Conflicts:
	SpringJDBCTemplate/WebContent/resources/include/templateSeccionista.jsp
	SpringJDBCTemplate/src/com/dai/controller/UtilizadorController.java
	build/web/WEB-INF/classes/com/dai/controller/UtilizadorController.class
	build/web/WEB-INF/classes/com/dai/dao/UtilizadorDaoImpl.class
	build/web/WEB-INF/jsp/registarUtilizador.jsp
	build/web/resources/include/templateSeccionista.jsp
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties