[fix] when two results are merged, really use the content with more text
update comment
[enh] add infoboxes and answers
[enh] add infoboxes and answers (clean up)
Merge remote-tracking branch 'upstream/master'
[fix] infoboxes and answers : pass all tests
[enh] wikidata engine : add links to musicbrainz
Merge pull request #104 from dalf/master

[enh] add infoboxes and answers, [fix] when two results are merged, really use the content with more text