리팩토링 및 서버 작업

Signed-off-by: Han Manjong <han@manjong.org>
Force merge to master

Merge branch 'manjong2'