Merged Differen Exceptions
Changed API methods to allow versions by mimetype
Commented out broken test
Merge branch 'master' into develop

Fixed Conflicts:
	org.bridgedb.rdb/test/org/bridgedb/rdb/Test.java