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

Conflicts:
	frontend/com.rochatec.athena.app/plugin.xml

Signed-off-by: Erick rocha <epr@ca115.synchro.com.br>