Merge branch '1.6' into dev

app/modules/wizard.ts

app/modules/ws2p/index.ts

app/modules/ws2p/lib/WS2PBlockPuller.ts

app/modules/ws2p/lib/WS2PClient.ts

app/modules/ws2p/lib/WS2PCluster.ts

app/modules/ws2p/lib/WS2PConnection.ts

app/modules/ws2p/lib/WS2PDocpoolPuller.ts

app/modules/ws2p/lib/WS2PRequester.ts

app/modules/ws2p/lib/WS2PServer.ts

app/modules/ws2p/lib/WS2PSingleWriteStream.ts

app/modules/ws2p/lib/WS2PStreamer.ts

app/modules/ws2p/lib/constants.ts

app/modules/ws2p/lib/impl/WS2PMessageHandler.ts

app/modules/ws2p/lib/impl/WS2PReqMapperByServer.ts

app/modules/ws2p/lib/impl/WS2PResponse.ts

app/modules/ws2p/lib/interface/WS2PReqMapper.ts

app/modules/ws2p/lib/interface/WS2PServerMessageHandler.ts

app/modules/ws2p/lib/ws2p-upnp.ts

app/service/BlockchainService.ts

app/service/FIFOService.ts