Merge pull request #27 from calvinjia/master

A few testing updates and pom update
use glassfish for jsp support