add Tools
Merge branch 'EJB'