Merge branch 'master', remote branch 'upstream/master'
Merge from upstream
Merge
gf4
gf4
Update
Merge pull request #98 from mattiashem/gf4_clean

Glassfish 4 Installation
Merging in glasshfish installation into new version branch
Merge pull request #99 from kribor/version-0.3.1

Version 0.3.1