Merge branch 'hotfix/ck-editor-toolbar'
updated version numbers
Merge branch 'master' into develop