version bump
Merge branch 'master' of github.com:divio/djangocms-text-ckeditor