Merge branch 'master' of https://github.com/simonjupp/lodestar into biomodels

Conflicts:
	web-ui/src/main/webapp/WEB-INF/ebi-lode-service.xml