test
Merge branch 'master' of https://github.com/bdult/farmstory_backoffice
user fix
test
user search add
user search add
serch update
Merge branch 'Unho' of https://github.com/bdult/farmstory_backoffice into Unho
test
serch complete
logout fix
user css update
child add
Merge branch 'jisoon'
Merge branch 'jisoon'
Merge branch 'master' of https://github.com/bdult/farmstory_backoffice
Merge branch 'master' into jisoon

Conflicts:
	src/main/java/com/bgg/farmstoryback/controller/UserController.java
	src/main/java/com/bgg/farmstoryback/dao/UserDao.java
	src/main/java/com/bgg/farmstoryback/service/UserService.java
	src/main/resources/query/userQuery.xml
	src/main/webapp/WEB-INF/views/common/header.jsp
	src/main/webapp/WEB-INF/views/user/user.jsp
	src/main/webapp/WEB-INF/views/user/userinsert.jsp
	src/test/java/com/bgg/farmstoryback/dao/UserDaoTest.java