Merge origin/master

Conflicts:
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
	includes/menu.php
Merge origin/master

Conflicts:
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
	colunista/css/style.css