Adicionando as view de adicionar e listar disciplinas
Adicionando as view de listar e editar disciplina
Adicionando a parte do cadastro de Disciplinas funcionando completo.
adadad
* Adicionando a parte do cadastro de Disciplinas funcionando completo.
Merge branch 'master' of https://github.com/Danillo/MyGridPuc

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	MyGridPuc/WebContent/WEB-INF/faces-config.xml
	MyGridPuc/WebContent/xhtml/vwCriarCurso.xhtml
	MyGridPuc/WebContent/xhtml/vwListarDisciplina.xhtml
	MyGridPuc/build/classes/br/com/mygridpuc/web/controle/CursoController.class
	MyGridPuc/src/br/com/mygridpuc/web/controle/CursoController.java
	MyGridPuc/src/br/com/mygridpuc/web/controle/DisciplinaBean.java
	MyGridPuc/src/br/com/mygridpuc/web/controle/DisciplinaController.java
	MyGridPuc/src/br/com/mygridpuc/web/entidade/Disciplina.java
	MyGridPuc/src/br/com/mygridpuc/web/negocio/DisciplinaService.java
	MyGridPuc/src/br/com/mygridpuc/web/negocio/DisciplinaServiceImpl.java
	MyGridPuc/src/br/com/mygridpuc/web/persistencia/DisciplinaDaoImpl.java
	Servers/Tomcat v7.0 Server at localhost-config/server.xml