서버관련
Merge
Merge branch 'master' of https://github.com/simnalamburt/adoctor

Conflicts:
	Client/src/com/adoctor/adoctor/DB/ScreenLog.java