contents
contents
contents
Merge branch 'master' of https://github.com/bdult/farmstory_backoffice
Merge branch 'master' into jisoon

Conflicts:
	src/main/java/com/bgg/farmstoryback/common/Interceptor.java
	src/main/java/com/bgg/farmstoryback/controller/BoardController.java
	src/main/java/com/bgg/farmstoryback/dao/BoardDao.java
	src/main/java/com/bgg/farmstoryback/service/BoardService.java
	src/main/resources/query/boardQuery.xml
	src/main/webapp/WEB-INF/views/brand/manage.jsp
	src/main/webapp/WEB-INF/views/common/head.jsp
	src/main/webapp/WEB-INF/views/common/layout-default.jsp
	src/main/webapp/WEB-INF/views/common/layout-pure.jsp
	src/main/webapp/WEB-INF/views/common/side-bar.jsp