Signed-off-by: erick.rocha <erick.rocha@synchro.com.br>
Merge branch 'master' of github.com:erickrocha/com.rochatec.athena

Conflicts:
	frontend/com.rochatec.athena.app/log/metallurgical.log