Code allowing Armory to communicate with an offline wallet running offline_serial_server.py
Merge branch 'testing' of git://github.com/etotheipi/BitcoinArmory into testing

Conflicts:
	armoryengine.py
Merge branch 'testing' of git://github.com/etotheipi/BitcoinArmory into testing

Conflicts:
	armoryengine.py
Merge branch 'testing' of git://github.com/etotheipi/BitcoinArmory into testing