Update category 2
Set test config files
Update category
Merge branch 'master' of https://github.com/bdult/farmstory_backoffice into soulmatt
컨텐츠 관리 기능 추가
-- 삭제 수정은 제외
Merge branch 'jisoon'
Merge branch 'master' of https://github.com/bdult/farmstory_backoffice into soulmatt
Update cate UI
브랜드 서비스 테스트
Merge branch 'jisoon'

Conflicts:
	src/test/java/com/bgg/farmstoryback/dao/CategoryDaoTest.java
brand delete 추가중
Add brand delete
Update cate
Merge branch 'master' of https://github.com/bdult/farmstory_backoffice
series CURL 완료
Merge branch 'master' of https://github.com/bdult/farmstory_backoffice
Contents 테스트 유닛 작성중
category test unit 작성중
Contents Service testcase 작성 중
Merge branch 'Unho' into jisoon

Conflicts:
	src/main/java/com/bgg/farmstoryback/controller/ViewController.java
	src/main/java/com/bgg/farmstoryback/dao/UserDao.java
	src/main/java/com/bgg/farmstoryback/dto/UserDto.java
	src/main/java/com/bgg/farmstoryback/service/UserService.java
	src/test/java/com/bgg/farmstoryback/dao/CategoryDaoTest.java
	src/test/resources/log4j.xml