Merge remote-tracking branch 'upstream/master' into test
Display order
sorting
Filter for Email and Phone number users added
nomovok - qt5 - supports phone number only ppl filtering - supports email only ppl filtering - last name / first name first on name