ARMORY-134 ARMORY-125 Write Tests for MultiSig ArmoryD support
Adding armoryd multisig functionality
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel

Conflicts:
	armoryd.py
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel
ARMORY-134 ARMORY-125 Write Tests for MultiSig ArmoryD support