master refactoring, now using JSF, Hibernate