Find applying annotations on the fly instead of in advance.
Merge branch 'repo-2.0' into pagination

Conflicts:
	faust/src/main/static/js/faust/text-display/text-display.js