ARMORY-235  Fixed various issues
Merge branch 'dev' of github.com:etotheipi/BitcoinArmory into dev