fixed ckeditor email link option
Merge branch 'release/0.9' into develop
solved merge conflicts
Merge pull request #183 from sulu-cmf/bugfix/ckeditor

fixed ckeditor email link option
Merge branch 'master' of git://github.com/sulu-cmf/SuluAdminBundle