Merge branch 'agoraa-master' of github.com:Axonn/ckeditor-agoraa into agoraa-master

Conflicts:
	README.md