(Again)Merge branch 'master' into estrutura

Conflicts:
	sql/mysql-crud-create.md
	sql/mysql-crud-delete.md
	sql/mysql-crud-read.md
	sql/mysql-crud-update.md