Creating EJB Module
Merge origin/master