git branch add and update
server update
update and rename
Merge branch 'pegasuskim' into develop

* pegasuskim:
  update and rename
  server update
  git branch add and update