Updated icons for toolbar. Cleaned up Icomoon session file to reduce its size and bring it up to date with the newest version of the Icomoon app.
Postpone scanning the document after the iframe and the drag canvas have been added
Make the heatmap a bit less trigger-happy
Updated Annotator to f8e68b2c (typed-packaging branch)
Merge pull request #964 from RawKStar77/iconwork

Updated icons for toolbar. Cleaned up Icomoon session file to reduce its size.
Fixed bug where the wrong icon would show marking an annotation as private.

Made a slight mistake in my Iconwork PR. This fixes it. On private annotations the wrong icon was showing.
Threadexp class was hidden in the page_search template

The threadexp class was inside the recursive li tag, and it has been constantly replaced. It was moved to the same place where in the viewer.html and we're not displaying it for the root elements.

Fixes #958
Notify SearchController about reloaded annotations.

After login/logout if there were search results, they were not displayed again. Now a new event is broadcasted to which the SearchController listens to and calls the refresh() again.
Currently it is done with a timer. The most elegant solution would be having an event about loading and anchoring all annotations and after that we could call this event properly.

Fixes #959
Search controller always builds from the root annotation.

Because of that many load top annotation labels were missing.

Fixes #948
Updated Annotator to fbfefb321 (typed-packaging branch). Fixes #963.
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