Update maven plugin version
Moved to servlet 3.0 / jsp 2.2
Changed web.xml to servlet 3.0 xsd
Refactor of webjsp part, code cleanup
Merge branch 'master' into dev_appengine