Issue #945 Block 5 - Narrative (diary) editor
Merge pull request #953 from pecko/issue945d

Issue #945 Block 5 - Narrative (diary) editor