NoteController
Merge remote-tracking branch 'github/SebastianKrebs'