Correct activity assignee/target transposition, fix new contact logic
Merge branch 'dev' into test