fixes for cwpp
Merge branch 'master' of github.com:chromaway/cc-wallet-engine

Conflicts:
	src/CWPPPaymentModel.js
'updating' status
style fixes