ISOC-12 Added default values for file fields for CDN Tax Receipts
Merge pull request #1 from Edzelopez/master

ISOC-12 Added default values for file fields for CDN Tax Receipts
AFABC-49 Bug fixes
Merge pull request #4 from Edzelopez/ISOC

AFABC-49 Bug fixes
Merge branch 'master' of https://github.com/JMAConsulting/CDNTaxReceipts into JMAConsulting-master

Manually resolved conflicts:
	templates/CRM/Cdntaxreceipts/Form/Settings.tpl
Merge branch 'JMAConsulting-master'