refactored PaymentModel stuff, added CWPP
Merge branch 'master' of github.com:chromaway/cc-wallet-engine