adjust some path issues
fixes #614
Merge branch 'beta' into 614

Conflicts:
	modmine/webapp/src/org/modmine/web/ModMineSearch.java
Merge pull request #660 from intermine/614

614