Started consolidation of EJBs
Finished EJB consolidation.
Merge branch 'master' of github.com:ghartshaw/Kurskatalog