카테고리 2차 수정
Merge branch 'master' of https://github.com/bdult/farmstory_backoffice

Conflicts:
	src/main/java/com/bgg/farmstoryback/common/JsonResponseMaker.java
	src/main/java/com/bgg/farmstoryback/controller/CategoryController.java
	src/main/java/com/bgg/farmstoryback/dao/CategoryDao.java
	src/main/java/com/bgg/farmstoryback/service/CategoryService.java
	src/main/resources/query/categoryQuery.xml
	src/main/webapp/WEB-INF/views/category/manage.jsp