null check for current team for current user
Merge branch 'develop'