CRM-15372 :patch to fix fee amount replacing amount
CRM-15374 - adjust query in getPaymentInfo to prevent extraneous fee-related rows showing up in Payment Info page.

----------------------------------------
* CRM-15374:
  https://issues.civicrm.org/jira/browse/CRM-15374
Merge pull request #4320 from yashodha/CRM-15372

CRM-15372 :patch to fix fee amount replacing amount
Merge pull request #4321 from davecivicrm/CRM-15374a

CRM-15374 - adjust query in getPaymentInfo to prevent extraneous fee-rel...