more test fixes
Merge pull request #1484 from kurund/text-fixes

more test fixes
CRM-13273 - is_email_receipt setting on recurring contribution should get precedence
CRM-13051 pledge detail report provides inaccurate totals

Conflicts:

	packages
CRM-13275 Pledge detail report not showing paid amount for cancelled,
also fixed up totals
Conflicts:

	packages
CRM-13275 fix stats to show total count by currency & grand total

Conflicts:

	packages
indentation fixes
Merge pull request #1489 from kurund/whitespace-fixes

indentation fixes
Merge pull request #1485 from eileenmcnaughton/CRM-13273

CRM-13273 - is_email_receipt setting on recurring contribution should be preferred..
Merge pull request #1487 from eileenmcnaughton/CRM-13275

CRM-13275 fixes on pledge report ported from 4.2
CRM-13061, chart fixes
Merge pull request #1490 from deepak-srivastava/softcredits

CRM-13061, chart fixes