Add DIC to context.xml, bugfix invalid comments in appserver.xml.tpl
Merge branch 'master' of https://github.com/wagnert/meta