log
Merge remote-tracking branch 'origin/desenvolvimento' into
desenvolvimento

Conflicts:
	log/system.log