Updated to use the https://github.com/tommica/webapptemplate