Micropayment code 90% complete. Needs testing, integration with proxy service and wallet
Minor merge conflict caused by file rename