Merge commit 'eefcdf0b64e2f0ddb78d71ca4d8022d2666bc4ab'

Conflicts:
	src/main/java/org/kids/controller/board/FileController.java
Merge branch 'master' into lhj

* master:

Conflicts:
	src/main/java/org/kids/controller/board/FileController.java