Merge branch 'develop' (early part) into btsx

Conflicts:
	programs/qt_wallet
	programs/web_wallet