Merge origin/master

Conflicts:
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
Merge origin/master
Merge origin/master

Conflicts:
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
Merge origin/master

Conflicts:
	bancodedados/db_tcc.mwb
	bancodedados/db_tcc.mwb.bak
Merge origin/master