resolve merge conflict
resolve merge conflict

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