[PT, MP, GS] {other} - fixed note-edit button
Merge branch 'master' of https://github.com/w00t2k1/sw14_free_25
[GS , MP, PT] {after test} - new note create green
[GS , MP, PT] {other} - merge conflict endconflicted
[GS , MP, PT] {other} - merge conflict endconflicted
[GS , MP, PT] {other} - merge conflict endconflicted