Merge origin/master

Conflicts:
	cadastro.php
	includes/funcoesUteis.inc
	pc/css/style.css
	restrito/painel.php
Merge origin/master

Conflicts:
	cadastro.php
	includes/funcoesUteis.inc
	pc/css/style.css
	restrito/painel.php
Merge origin/master

Conflicts:
	colunista/inserirMateriaNova.php
Merge origin/master

Conflicts:
	colunista/inserirMateriaNova.php
Merge origin/master

Conflicts:
	js/funcoes.js
Merge origin/master

Conflicts:
	colunista/css/style.css
Merge origin/master

Conflicts:
	colunista/css/style.css
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	colunista/css/style.css
Merge origin/master

Conflicts:
	colunista/css/style.css
	colunista/editarmateria.php