harmony

Signed-off-by: travisyuan <paulandlp@yahoo.com>
Merge branch 'master' of https://github.com/travisyuan/Hercules

Conflicts:
	src/char/char.c
	src/common/Makefile.in
	src/common/core.c
	src/common/mmo.h
	src/common/socket.c
	src/login/account.h
	src/login/account_sql.c
	src/login/login.c
	src/login/loginlog_sql.c
	src/map/Makefile.in
	src/map/chrif.c
	src/map/chrif.h
	src/map/clif.c
	src/map/map.c
	src/map/pc_groups.c
	src/map/pc_groups.h
	src/map/script.c