tmp save state
merge
before merge
before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	analyzer/protocol/Packet.cpp
	analyzer/win32gui/Analyzer.aps
	analyzer/win32gui/DataCollectionDlg.cpp
bug fix