Updated blog editor with image upload support
Fixed merge conflicts