Resolving conflicts
Add OpenEJB setup and initial test for EJBs
Using the released TomEE version
Fixing SCM error
Merge branch 'OpenEJB'
Removing the hard-coded dependency to 'web' device-type for SimplePush clients; Added tests and updated existing ones
Correcting javadoc