initial id resolution component integrated
Merge branch 'dev' of github.com:intermine/intermine into dev

Conflicts:
	intermine/webapp/main/resources/webapp/WEB-INF/global.web.properties