added config to merge web-model.xml and web.xml #313 #309