[C] for sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Skima/Classes/HideSkill.cpp