updated dev branch with master
Changed logo path to all/files/logo/XX
slight modification to logo margins
removed ckeditor library
fix merge conflicts
Merge branch 'master' of https://github.com/reko888/egrow