Mudanças Gerais Layoute
Adequações Layoute
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyGridPuc/WebContent/logado/vwPrincipal.xhtml
	MyGridPuc/WebContent/publico/css/bootstrap.min.css
	MyGridPuc/WebContent/publico/css/form.css
	MyGridPuc/WebContent/publico/css/login.css
	MyGridPuc/WebContent/publico/css/mws-theme.css
	MyGridPuc/WebContent/publico/css/themer.css
	MyGridPuc/WebContent/publico/images/mws-logo.png
	MyGridPuc/WebContent/publico/login.xhtml
	MyGridPuc/WebContent/template/cabecalho.xhtml
	MyGridPuc/WebContent/template/index.xhtml
	MyGridPuc/WebContent/template/menu.xhtml
	MyGridPuc/build/classes/.gitignore
Merge remote-tracking branch 'upstream/master'
Formularios Exemplos.
Merge pull request #11 from karlysson/master

Juntar a parte de layout Gerais
gitIgnore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	MyGridPuc/build/classes/.gitignore