Add team up modal to the main view modals
Merge branch 'master' into kris