3_2266B_784
Merge branch 'master' of https://github.com/cora32/nesca

Conflicts:
	00000036.wav
	ActivityDrawerTh_HorNet.cpp
	ActivityDrawerTh_HorNet.h
	CheckKey_Th.cpp
	CheckKey_Th.h
	CheckProxy_Th.cpp
	CheckProxy_Th.h
	DrawerTh_GridQoSScanner.cpp
	DrawerTh_GridQoSScanner.h
	DrawerTh_HorNet.cpp
	DrawerTh_HorNet.h
	DrawerTh_ME2Scanner.cpp
	DrawerTh_ME2Scanner.h
	DrawerTh_QoSScanner.cpp
	DrawerTh_QoSScanner.h
	DrawerTh_VoiceScanner.cpp
	DrawerTh_VoiceScanner.h
	IRCPinger_Th.cpp
	IRCPinger_Th.h
	STh.cpp
	STh.h
	connector.cpp
	finder.cpp
	irc_nmblinker.cpp
	irc_nmblinker.h
	login.txt
	main.cpp
	msgcheckerthread.cpp
	msgcheckerthread.h
	negatives.txt
	nesca_3.cpp
	nesca_3.h
	nesca_3.qrc
	nesca_3.ui
	nesca_startModule.cpp
	oIRC_Th.cpp
	oIRC_Th.h
	pass.txt
	piestat.cpp
	piestat.h
	progressbardrawer.cpp
	progressbardrawer.h
	resource.h
	sshpass.txt
	vercheckerthread.cpp
	vercheckerthread.h
	wflogin.txt
	wfpass.txt