ㄴㄴ
Merge remote-tracking branch 'origin/master' into smc
ㅇㅇ
gittest
Merge branch 'smc'

Conflicts:
	src/test/java/org/kids/board/memberReq/MapperTest.java