ARMORY-201 Python Code Refactoring
Merge branch 'dev' of github.com:etotheipi/BitcoinArmory into dev

Conflicts:
	ArmoryQt.py