Commit Tipo de Feriado e Empresas
Merge remote-tracking branch 'origin/master'

Conflicts:
	logs/automation.log
	logs/automation.log.1
	target/classes/META-INF/maven/tc/automacaoTC/pom.properties