Merge branch 'feature/add_participants_page_#6' into staging