memberReq 커밋
Merge branch 'master' into 1229Jeon

Conflicts:
	target/classes/org/kids/controller/board/ReplyController.class
	target/classes/org/kids/service/board/FileService.class
memberReq 수정 12/29일 6:45분
memberReq 부분 커밋
Merge branch 'master' of https://github.com/KiD-repo/pipe
Merge branch '1229Jeon'

Conflicts:
	src/main/webapp/WEB-INF/views/partial/footer.jsp