Merge branch 'rich_text_editor' of github.com:p2pu/learning-circles into rich_text_editor