ARMORY-134 ARMORY-125 Write Tests for MultiSig ArmoryD support
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel
ARMORY-147 made some small fixes
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel

Conflicts:
	armoryd.py
ARMORY-147 TiaB causes some armoryd tests in pytest to fail