Glassfish 4.0 Java 7 and 4.1 Java 8
Merge pull request #288 from zhengyal/master

Glassfish 4.0 Java 7 and 4.1 Java 8