bitpay -> zbad405 package.json changes
Merge remote-tracking branch 'derfshaya/master' into BlockrStyleAPI

Conflicts:
	package.json