Merge remote-tracking branch 'upstream/master'
Correção na palavra Motivo
Correção na Palavra Motivo
Correção na palavra Motivo
Merge branch 'daversilva-master'

Conflicts:
	MyGridPuc/src/br/com/mygridpuc/web/controle/CursoController.java
Merge com o Pull Request
Git Ignore
Merge pull request #14 from wcreis/master

Merge do David
Importar Arquivo terminado Front end
Merge branch 'master' of https://github.com/Danillo/MyGridPuc into Branch_master

Conflicts:
	MyGridPuc/build/classes/.gitignore
Merge branch 'master' of https://github.com/karlysson/MyGridPuc into karlysson-master

Conflicts:
	MyGridPuc/WebContent/logado/admin/vwImportarArquivo.xhtml
	MyGridPuc/WebContent/publico/plugins/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css
Merge branch 'karlysson-master'
Merge branch 'master' of https://github.com/Danillo/MyGridPuc
Teste Viwer Matriz
Ignorando persistence.xml
Conflicts:
	MyGridPuc/build/classes/.gitignore
Correções no Cadastro de Disciplina.

Atendendo ao Issue: Falha na Disciplina #18
Merge pull request #20 from wcreis/master

Correções Cadastro de Disciplina
Layout de Listar Curso  + Icone na aba do navegador.
Merge branch 'master' of https://github.com/karlysson/MyGridPuc into karlysson-master

Conflicts:
	MyGridPuc/build/classes/br/com/mygridpuc/web/controle/DisciplinaController.class
Merge branch 'karlysson-master'