# Conflicts:
#	README.md
#	package-lock.json
#	package.json
#	sample/index.html
#	src/ckeditor.js
#	webpack.config.js