edit contact to wait for ajax load before submit, fixes #8082
continued js changes, refs #8082
Merge branch 'dev' into test