Merge pull request #33 from wagnert/master

Add DIC to context.xml, bugfix invalid comments in appserver.xml.tpl