Updated files to load
Merge branch 'master' into develop
Merge branch 'develop' into Christian

Fixed Conflicts:
	org.bridgedb.hack.loader/src/org/bridgedb/loader/RunLoader.java
fixed directory
Merge branch 'master' into develop
Merge branch 'develop' into Christian
Changed transitive file to load
Merge branch 'master' into develop
Merge branch 'develop' into Christian

Conflicts:
	org.bridgedb.hack.loader/src/org/bridgedb/loader/RunLoader.java
Updates to datasource reflected in tests
Added data needed by QueryExpander
Partial work on geting Vai
Added structure for doing viaLinks
Added check for Chembl void
Fix bug in log statements
Merge branch 'develop' into Christian
Multiple Default profiles
added in scrubs
Merge branch 'develop' into Christian

Fixed Conflicts:
	org.bridgedb.uri.sql/test/org/bridgedb/uri/UriListenerTest.java