[PLAT-0000] 뷰단 수정
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/pages/user/login.jsp