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