re-added deleted teams admin controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/static/js/controllers/meet.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/static/js/controllers/meet.js