Move trade.services.js, delete old donations.services.js
Integrate edit_merchant into angular