Merge remote-tracking branch 'remotes/origin/rc' into mike_payments

Conflicts:
	lib/module.js
	lib/module.ts
	typings/mykoop-transaction/interfaces.d.ts