* merging.
Merge branch 'Features/notes' of github.com:SaltySoft/SmartBlocks into Features/notes