removed Java 7 syntax for cobertura error
Merge branch 'working' into ejb-working
added lab