fixes for code updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/wallet.cpp