Added team module
Added tests for team module
Small fixes
Merge branch 'team' into develop