Merge branch 'master' into sc_config

Conflicts (Resolved):
	src/map/pc.c
	src/map/skill.c
	src/map/status.c

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>