Merge branch 'master' into merge-master-into-develop

Conflicts:
	lib/bet.py
	lib/bitcoin.py
	lib/burn.py
	lib/order.py
	test/db.dump
	test/output.json