+ viewNoteView.phtml
Merge branch 'develop'