Added address custom fields to certain templates

Hi @sluc23, this merge contains dev to implement address custom fields in some templates, requested here: #4 (closed)

I have also adapted some reports according to CiviCRM version 5.21.2