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'
Cadastro de Matriz
Merge branch 'master' into matriz
Importacao de Matriz e Disciplinas

Visualizacao de Matrizes.