as
Ajustando nomeclatura
Documentação
Merge remote-tracking branch 'origin/master' into Dev

Conflicts:
	function/business/FileManager.php