Merge branch 'hotfix/1.5.2'
Fix #419 correct order for team projects
Merge branch 'hotfix/teams-ordering' into develop