release 04.13.01
0414 
새벽2시37분

read.jsp div태그 적용
4월14일 수정 qna
Merge remote-tracking branch 'origin/qna' into release
Merge remote-tracking branch 'origin/jaewook' into release

Conflicts:
	WebContent/assets/img/rest/content/content_1.jpg
	WebContent/assets/img/rest/main/main_1.gif
	WebContent/assets/img/rest/menu/menu1_1.jpg
	WebContent/assets/img/rest/menu/menu1_2.jpg
	WebContent/board/rest/readRest.jsp
Merge branch 'develop' into release
release 04.14.01
4월14일
11:56

Read.jsp 디자인 완료

문의하기 수동작업
해야할일 장바구니 insert
rest_board
restopt_board

각 테이블 컬럼 수정 및 그에 맞는 액션 수정까지 완료함.
read.jsp 디자인 수정 완료
디자인 commit
4월14일

장바구니 담기 버튼 구성
액션으로 파라미터 넘기기 성공

but 한글이 깨져서 들어감. 이거 해결해야함
insertAction으로 한글안깨지고 잘들어감
insertAction으로 한글안깨지고 잘들어감
4월14일
장바구니 insert 구현 완료3
merge!!
Merge branch 'develop' into release

Conflicts:
	build/classes/board/qna/action/ListQnaAction.class
Merge remote-tracking branch 'origin/jaewook' into release

Conflicts:
	WebContent/assets/img/rest/content/content_1.jpg
	WebContent/assets/img/rest/menu/menu10_1.jpg
	WebContent/assets/img/rest/menu/menu11_1.jpg
	WebContent/assets/img/rest/menu/menu12_1.jpg
	WebContent/assets/img/rest/menu/menu13_1.jpg
	WebContent/assets/img/rest/menu/menu14_1.jpg
	WebContent/assets/img/rest/menu/menu4_1.jpg
	WebContent/assets/img/rest/menu/menu5_1.jpg
	WebContent/assets/img/rest/menu/menu6_1.jpg
	WebContent/assets/img/rest/menu/menu7_1.jpg
	WebContent/assets/img/rest/menu/menu9_1.jpg
	WebContent/board/rest/readRest.jsp
	WebContent/board/se2/upload/2014_04_10_151955.jpg
	build/classes/board/rest/dao/RestDAO.xml
	build/classes/struts.xml
	src/board/rest/action/InsertRestAction.java
	src/board/rest/dao/RestDAO.xml
	src/board/rest/dto/RestDTO.java
	src/board/restopt/dto/RestoptDTO.java
	src/struts.xml
resources cleared