Adding placeholders to avatars
Solving conflict
Adding sharedspace ckeditor plugin