Merged stable features from edu branch
Bug fixes from previous merge
Added teams page back into master
Merge branch 'master' into devel