ok.
Merge branch 'hotfix/hotfix_1' into develop

Conflicts:
	qt/axnSockMsg.cpp
Merge branch 'develop'