Add EJB and SessionFacades
Merge origin/master