fixes slow builds introducing property to distinguish build and webapp

Conflicts:
	intermine/objectstore/main/src/org/intermine/objectstore/intermine/ObjectStoreWriterInterMineImpl.java
	thalemine/default.intermine.webapp.properties
Merge pull request #732 from sergiocontrino/betacp

fixes slow builds introducing property to distinguish build and webapp
Merge branch 'beta' into emma
Merge branch 'emma' of github.com:intermine/intermine into emma