Users can't be added team multiple times

user updated from modal adds
show user list in modal, add/remove
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/partials/user.html