카테고리 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
category 버그 수정
category 버그 수정
카테고리 버그 수정
클래스 정리
회원 로그인 수정
회원 로그인
회원 로그인 수정 2
로그인 bug fix
test
Merge branch 'master' into bdult

Conflicts:
	src/main/java/com/bgg/farmstoryback/common/FarmstoryInterceptor.java
	src/main/java/com/bgg/farmstoryback/controller/ItemController.java
	src/main/java/com/bgg/farmstoryback/controller/ViewController.java
	src/main/resources/query/payQuery.xml
	src/main/webapp/WEB-INF/views/contents/list.jsp