Replace iScrubber code for CoffeeScript source and not derived code.
Merge branch 'master' into new-annotations4
Improved scrolling lock.
Comma.
Follow which annotations are linked to a highlight.
Render annotations selected.
Set hovering state when hovering on a related entity.
Special cases which are also hovering.
Merge branch 'new-annotations4' of https://github.com/peerlibrary/peerlibrary into new-annotations4-editor

Conflicts:
	client/publication.coffee
	server/annotation.coffee