Matthew's new whizzy query for events, add email and tel fields to contact
Merge remote-tracking branch 'origin/master'