Merge remote-tracking branch 'origin/master'

Conflicts:
	node/crypto2crypto.py
	node/market.py