Edit.jsp 플레이어 UI 병합
Merge branch 'master' of https://github.com/SProject1ROOT/ROOT

Conflicts:
	Edit.jsp
	Projects.jsp