ARMORY-136 Saving Lockboxes and Sig Collectors adds too many extentions to file name
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel

Conflicts:
	armoryd.py
Merge branch 'devel' into doug-devel