Add wallet and paypal to my funds page
Merge ipn