Sprint 1 retro
Merge branch 'dev' into topic_items