Signed-off-by: erick <erick@COVIL-SERVER.(none)>
Merge branch 'master' of github.com:erickrocha/com.rochatec.athena

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