AngeloMendes/SCP-LP — pull request #26 by AngeloMendes (2014-09-18 18:19:23+00:00)
Title: Merge origin/master

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