ARMORY-14 - implemented encryptwallet
ARMORY-31 - Added minimizeDERSignaturePadding and Unit Test
ARMORY-31 Fixed issues with Malleability fix.
Merge remote-tracking branch 'remotes/origin/testing' into rrldbtest

Conflicts:
	.gitignore
	armoryengine.py
ARMORY-14: Added getrawtransaction and unit tested
ARMORY-14: gettxout
Added ph shorthand for prettyHex of binary_to_hex for debugging.
fixed argument to getrawtransaction to use hex input instead of binary.
ARMORY-14: Added listunspent, importprivkey, and unlockwallet
ARMORY-35: Message Signing. Initial version of UI complete.
ARMORY-35: Partial completion of signature verification
ARMORY-35: Message Signing
Merge remote-tracking branch 'remotes/origin/testing' into rrldbtest

Conflicts:
	ArmoryQt.py
	armoryengine.py
	dialogs/toolsDialogs.py
	extras/findpass.py
	jasvet.py
Merge????
ARMORY-3 Implement Unit Tests for secure print and Fragmented Backups
ARMORY-39 Implement Unit Tests for secure print and Fragmented Backups
ARMORY-39: Improved code coverage for FragmentedBackupTest
ARMORY-36 Finish getrawtransaction in armoryd
Implemented remaining elements of getrawtransaction
Merged!  0.90-beta code into Andy's refactored code

Conflicts:
	cppForSwig/old_not_very_good_tests.cpp
Fix missing import
Fix Merge issues
Add PromoKit