Merge pull request #1 from chrissPony/master-edit

Master edit
upgrade to 2.5
renove package doc blocks
cs
make global settings
wording
Merge branch 'master' of github.com:MenschDankeGmbH/cakephp-wysiwyg into master-edit

Conflicts:
	View/Helper/WysiwygAppHelper.php