Merge origin/master

Conflicts:
	src/java/controller/PesquisarCurso.java
	src/java/javaSCP/Curso.java
	web/pesquisarCurso.jsp