ARMORY-180 Fix Helgabutters' bugs
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel