Merge origin/master

Conflicts:
	admin/css/style.css
	admin/novoUsuario.php
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
	includes/funcoesUteis.inc
Merge origin/master
Merge origin/master

Conflicts:
	admin/css/style.css
	admin/novoUsuario.php
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
	includes/funcoesUteis.inc
Merge origin/master
Merge origin/master

Conflicts:
	admin/css/style.css
	admin/novoUsuario.php
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
	includes/funcoesUteis.inc
Merge origin/master

Conflicts:
	admin/css/style.css
	admin/novoUsuario.php
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
	includes/funcoesUteis.inc