Correct the template to edit merchants
Refactor donations to use ng services
Minor corrections on trade