fix role for team-member, check role for dashboard
commit before pull
fix conflicts in ScrumBoardCollectionView and ScrumPageModelView