Merge branch 'master' of https://github.com/danielfs/BeginningJavaEE6WithGlassfish3.git