entidades
Merge branch 'master' of https://github.com/cspnoliveira/Tecno

Conflicts:
	src/conf/jpa-diagram.jpa