ARMORY-140
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel