Revert "롤백 1"

This reverts commit 5eb3100009cd1a30bc7259761a29543dfe67ce6a.
Revert "Revert "롤백 1""

This reverts commit a6dc704953ff12cf7b0770a4ca6492e5a5c32243.
update user list
update user list2
userdaoTest
update adduser
update 2
master sync
user list update
Contents 테스트 유닛 작성중
add user access & logout
category test unit 작성중
login & session update
login final update
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
ViewController Conflict 수정
Brand, Category, ItemGroup, Item Test Case 완료
Update