added config to merge web-model.xml and web.xml #313 #309
Merge branch 'intermine-1.2.1' of github.com:intermine/intermine into intermine-1.2.1