add count to Note node
Merge remote-tracking branch 'origin/master' into scaffold