합체중
합체중2
합체중
리뷰까지 합체
Merge remote-tracking branch 'origin/master' into fox

Conflicts:
	MovieProject/WebContent/WEB-INF/views/board/notice.jsp
	MovieProject/WebContent/WEB-INF/views/board/read.jsp
	MovieProject/WebContent/WEB-INF/views/movie/readMovie.jsp
	MovieProject/WebContent/WEB-INF/web.xml
	MovieProject/WebContent/css/board.css
	MovieProject/WebContent/css/movie.css
	MovieProject/WebContent/dropOut.jsp
	MovieProject/WebContent/review.jsp
	MovieProject/src/movie/dataaccess/BoardDaoImpl.java
	MovieProject/src/movie/web/controller/MovieController.java