teste

teste
teste

teste
Merge remote-tracking branch 'origin/master'

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