Merge branch 'develop'

release-1.0
Merge branch 'master' of https://github.com/iliakplv/notes

release-1.1