Working on note creation/editing.
Merge branch 'master' into release
Updating add-on XMl.