Actually fixes #992, closes #996, adds support for payment transactions
to be tied to deliveries.
Merge branch 'master' into develop

Conflicts:
	version.txt