a
Merge branch 'master' of https://github.com/denerlima/sysaid

Conflicts:
	src/main/resources/META-INF/persistence.xml