Merge pull request #88 from thelabtech/MH-602

Fix search contacts to be assigned in add question
Fix edit question - search of autoassign contacts
Fix conflicts after merging MH-606 to dev