1. Node note view added.
Merge branch 'master' of https://github.com/kid143/Minerva

resolve conflicts