Merge pull request #1071 from kurund/CRM-12974

CRM-12974, fixed hardcoded currency symbol
CRM-12974, currency formatting fixes