Fixed an slight error in a comment
Merge branch '0.91-dev' into testing

Conflicts:
	armoryd.py
Added missing icon file, fixed fee calc in sweep priv key
Merge branch '0.91-dev' of github.com:etotheipi/BitcoinArmory into 0.91-dev