ckeditor added to projects,blog,problems
Blog completed
static site working
merge conflict fixed