Merge pull request #1 from danohuiginn/master

Track v1.2.x of annotatorjs
Feature for storing annotations relative to content (using node ID).
Merges branch 'node_based_annotations' of git://github.com/danohuiginn/openethnographer
Allow identifying annotation location by node ID only (=uri field NULL)
make node ID default to NULL (indicating that uri alone contains the location)
fix node ID determination for cases where URL aliases are enabled
Merge pull request #1 from edgeryders/danohuiginn-node_based_annotations

Node based annotations: small fixes