Changes location where ckeditor pictures and attachments are stored
Merge branch 'master' into develop