disable conversation creation for those without a team
clean up tutorials view code
merge origin/master