- fix glassfish-resources.xml path
Merge branch 'origin/master'