[#787 state:resolved] fixed problem when trying to move a contact to a team member.  Also added tests.  I found an issue with the memberships changing on validation failures but will fix that in a later commit
Merge branch 'rm_production'