Signed-off-by: ericrf <eric_freitas@hotmail.com>
spring
Merge branch 'master' of https://github.com/ericrf/nbejbproject

Conflicts:
	testeEJB/ejbModule/testeEJB/session/stateless/GeneroManagerBean.java
	testeWEB/src/testeWEB/servlet/GeneroServlet.java