fixing merge issues with 0.91-dev
Merge remote-tracking branch 'remotes/origin/xbp_to_0.91-dev' into 0.91-dev

Conflicts:
	ArmoryQt.py
	armoryengine/ArmoryUtils.py
	qtdialogs.py
xpbackport merge fixes