Fixed issue where active user may not be set properly
Fixed issue where on load the teams will reload twice
ndssssssss
isadfadsfhadsnf
Merge remote-tracking branch 'origin/master'