manual merge, fix minor import issue

Author: Jonathan Warren

src/shared.py

@@ -22,7 +22,6 @@
 
 # Project imports.
 from addresses import *
-from debug import logger
 import highlevelcrypto
 import shared
 import helper_startup