fix dao
Merge branch 'master' of https://github.com/gang-of-7/path-to-smoke-in-rotterdam-ejb

Conflicts:
	ejbModule/com/bionic/dao/generic/AbstractDAO.java