Merge pull request #966 from RawKStar77/patch-1

Fixed bug where the wrong icon would show marking an annotation as private.
Updated DTM to b29aa304, fixes #990
Do no reset threading plugin content when annotations are loaded.

Fixes #972
Updated Annotator TextHighlights plugin to  c90ac7cd (typed packaging branch), with performance improvements
Create separate method for looking up a list of annotations from IDs
Added some comments
Don't try to add emphasis to highlights before they are created. Fixes #921.
Update DTM to 7b12a39f (master branch).
updated dom-text-matcher to b6936618 (master branch), with bugfix
Remove noisy exception, add comments

Conflicts:
	h/js/services.coffee
Add protection against null annotations in addEmphasis and removeEmphasis
Updated dom-text-mapper to e2903c21 (master branch)
Clear selection on adder button. Fixes #961
Changed how threading works.
Fixed error spotted by @dwhly.
Rebased to newest version of develop branch, fixed bug where collapsing behaviour was different for search results.