ARMORY-134 ARMORY-125 Write Tests for MultiSig ArmoryD support
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel
Updated Lockbox definitions to use LockboxPublicKey objs
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel
Fixed bug in new LBPubKey code
ARMORY-125 - Improvements for armoryd

Added the ability to add wallets or lockboxes after armoryd has started.
ARMORY-125 - Improvements for armoryd

Added the ability to add wallets and lockboxes after armoryd has started.
ARMORY-125 - Improvements for armoryd

Tiny change designed to make armoryd active wallet listings easier to parse.
Merge branch 'doug-devel' of github.com:etotheipi/BitcoinArmory into devel
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel

Conflicts:
	armoryd.py
ARMORY-125 - Improvements for armoryd

Fix a bizarre merge issue by reverting some long-gone changes.