New changelist
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.js
로그인 / 회원가입 관련 server side coding