[C] .
Merge remote-tracking branch 'origin/v0.3_Skill_Make' into v0.3_Skill_Make

Conflicts:
	Skima/Classes/TcpClient.cpp
Merge branch 'v0.3_Skill_Make' of https://github.com/dlakwwkd/CommitAgain into v0.3_Skill_Make