Fix merge regression.
Add missing dependency.
Fix require statements of article.
Deactivate indexing of annotations as it is incompatible currently.
Hack: overwrite existing nodes in Article.fromSnapshot().
Merge branch 'master' of github.com:substance/article

Conflicts:
	tests/document.js