Fixed a bug that didn't display widgets
id resolver updates
new and old ways of setting id resolver data file path compatible now
fixed a npe caused by trim
Added backwards compatibility hack.
Merge branch 'master' of github.com:intermine/intermine
remove FAQ link, it's been retired
Merge branch 'master' of https://github.com/intermine/intermine into dev

Conflicts:
	bio/core/main/src/org/intermine/bio/dataconversion/WormBaseIdResolverFactory.java