Edited Note and NoteCtrl angular files
Fixed conflict file blocknote.js