Add checkboxes for 'noPhone' and 'noEmail' fields
Merge remote-tracking branch 'origin/master'