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

Conflicts:
	web-ui/src/main/resources/lode.properties
	web-ui/src/main/resources/log4j.xml
	web-ui/src/main/webapp/scripts/lode.js

working new version