story/VOGRE-43

[Girik1105]

Guidelines for Pull Requests

If you haven't yet read our code review guidelines, please do so, You can find them here.

Please confirm the following by adding an x for each item (turn [ ] into [x]).

• I have removed all code style changes that are not necessary (e.g. changing blanks across the whole file that don’t need to be changed, adding empty lines in parts other than your own code)
• I am not making any changes to files that don’t have any effect (e.g. imports added that don’t need to be added)
• I do not have any sysout statements in my code or commented out code that isn’t needed anymore
• I am not reformatting any files in the wrong format or without cause.
• I am not changing file encoding or line endings to something else than UTF-8, LF
• My pull request does not show an insane amount of files being changed although my ticket only requires a few files being changed
• I have added Javadoc/documentation where appropriate
• I have added test cases where appropriate
• I have explained any part of my code/implementation decisions that is not be self-explanatory

Please provide a brief description of your ticket

When searching for concepts during annotating, VIAF needs to be searched as well.

Description
Besides Conceptpower, VIAF should also be searched. The search results should show exact matches first from Conceptpower and then from VIAF, and then other results (first conceptpower then VIAF).

VOGRE-43

Are there any other pull requests that this one depends on?

#76
#59

Anything else the reviewer needs to know?

[diging-jenkins]

Can one of the admins verify this patch?

[jdamerow]

Resolve conflicts please