<stable/0.1> Merge branch 'feature/timeline-entry-images' into stable/0.1
<feature/timeline-entry-images> Merge branch 'stable/0.1' into feature/timeline-entry-images