Added some lockbox stuff to armoryd, new calc-fee func
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel