restrict egeloen/ckeditor-bundle to ~2.1
Merge branch 'master' into sf23-bs3