* merging.
Merge branch 'Features/notes' of github.com:SaltySoft/SmartBlocks into Features/notes
* add note parameter popup to add user to the note.
Merge branch 'Features/notes' of github.com:SaltySoft/SmartBlocks into Features/notes