Update submodules
Merge branch 'master' into devshares

Conflicts:
	programs/qt_wallet