Merge remote-tracking branch 'upstream/master'
Importar Arquivo terminado Front end
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