resolve merge conflict
resolve merge conflict

kyucrane/PyBitmessage,Erkan-Yilmaz/PyBitmessage,JosephGoulden/PyBitmessageF2F,xeddmc/PyBitmessage,krytarowski/PyBitmessage,rzr/PyBitmessage,bmng-dev/PyBitmessage,debguy0x/PyBitmessage,timothyparez/PyBitmessage,torifier/PyBitmessage,lightrabbit/PyBitmessage,torifier/PyBitmessage,domob1812/PyBitmessage,xeddmc/PyBitmessage,kyucrane/PyBitmessage,lightrabbit/PyBitmessage,domob1812/PyBitmessage,tigerbunny/bitmessage,Erkan-Yilmaz/PyBitmessage,hb9kns/PyBitmessage,mailchuck/PyBitmessage,torifier/PyBitmessage,krytarowski/PyBitmessage,Atheros1/PyBitmessage,mailchuck/PyBitmessage,metamarcdw/PyBitmessage-I2P,torifier/PyBitmessage,rzr/PyBitmessage,lightrabbit/PyBitmessage,debguy0x/PyBitmessage,mailchuck/PyBitmessage,debguy0x/PyBitmessage,hb9kns/PyBitmessage,tigerbunny/bitmessage,timothyparez/PyBitmessage,timothyparez/PyBitmessage,debguy0x/PyBitmessage,JosephGoulden/PyBitmessageF2F,metamarcdw/PyBitmessage-I2P,Atheros1/PyBitmessage,gnu3ra/PyBitmessage,lightrabbit/PyBitmessage,hb9kns/PyBitmessage,mailchuck/PyBitmessage,hb9kns/PyBitmessage,Atheros1/PyBitmessage,domob1812/PyBitmessage,timothyparez/PyBitmessage,bmng-dev/PyBitmessage,gnu3ra/PyBitmessage,Atheros1/PyBitmessage,tigerbunny/bitmessage,bmng-dev/PyBitmessage