Upgrade to sitemesh 3 and servlet api 2.5