some updates
Merge branch 'master' of https://github.com/Dorrro/DiagnosticModule

Conflicts:
	DiagnosticModule.pro
	IVersionController.h
	TCMSReader.h
	cctvversioncontroller.cpp
	cctvversioncontroller.h
	configuration.cpp
	configuration.h
	configuration.ini
	main.cpp
	sqlmanager.h
	syslogdatamanager.h
	tcpclient.cpp
	versioncontrollermanager.cpp
	versioncontrollermanager.h