우와왕~~~~~~~~~~~~앙
리뷰수정
커밋커밋 송영욱바보
커밋
음??
Merge remote-tracking branch 'origin/master' into fox

Conflicts:
	MovieProject/WebContent/WEB-INF/views/board/writeForm.jsp
	MovieProject/WebContent/WEB-INF/views/movie/updateMovieForm.jsp
	MovieProject/WebContent/WEB-INF/views/movie/writeMovieForm.jsp
	MovieProject/WebContent/WEB-INF/views/review/review.jsp
	MovieProject/WebContent/ckeditor/CHANGES.md
	MovieProject/WebContent/ckeditor/LICENSE.md
	MovieProject/WebContent/ckeditor/build-config.js
	MovieProject/WebContent/ckeditor/ckeditor.js
	MovieProject/WebContent/ckeditor/config.js
	MovieProject/WebContent/ckeditor/contents.css
	MovieProject/WebContent/ckeditor/lang/af.js
	MovieProject/WebContent/ckeditor/lang/ar.js
	MovieProject/WebContent/ckeditor/lang/bg.js
	MovieProject/WebContent/ckeditor/lang/bn.js
	MovieProject/WebContent/ckeditor/lang/bs.js
	MovieProject/WebContent/ckeditor/lang/ca.js
	MovieProject/WebContent/ckeditor/lang/cs.js
	MovieProject/WebContent/ckeditor/lang/cy.js
	MovieProject/WebContent/ckeditor/lang/da.js
	MovieProject/WebContent/ckeditor/lang/de.js
	MovieProject/WebContent/ckeditor/lang/el.js
	MovieProject/WebContent/ckeditor/lang/en-au.js
	MovieProject/WebContent/ckeditor/lang/en-ca.js
	MovieProject/WebContent/ckeditor/lang/en-gb.js
	MovieProject/WebContent/ckeditor/lang/en.js
	MovieProject/WebContent/ckeditor/lang/eo.js
	MovieProject/WebContent/ckeditor/lang/es.js
	MovieProject/WebContent/ckeditor/lang/et.js
	MovieProject/WebContent/ckeditor/lang/eu.js
	MovieProject/WebContent/ckeditor/lang/fa.js
	MovieProject/WebContent/ckeditor/lang/fi.js
	MovieProject/WebContent/ckeditor/lang/fo.js
	MovieProject/WebContent/ckeditor/lang/fr-ca.js
	MovieProject/WebContent/ckeditor/lang/fr.js
	MovieProject/WebContent/ckeditor/lang/gl.js
	MovieProject/WebContent/ckeditor/lang/gu.js
	MovieProject/WebContent/ckeditor/lang/he.js
	MovieProject/WebContent/ckeditor/lang/hi.js
	MovieProject/WebContent/ckeditor/lang/hr.js
	MovieProject/WebContent/ckeditor/lang/hu.js
	MovieProject/WebContent/ckeditor/lang/id.js
	MovieProject/WebContent/ckeditor/lang/is.js
	MovieProject/WebContent/ckeditor/lang/it.js
	MovieProject/WebContent/ckeditor/lang/ja.js
	MovieProject/WebContent/ckeditor/lang/ka.js
	MovieProject/WebContent/ckeditor/lang/km.js
	MovieProject/WebContent/ckeditor/lang/ko.js
	MovieProject/WebContent/ckeditor/lang/ku.js
	MovieProject/WebContent/ckeditor/lang/lt.js
	MovieProject/WebContent/ckeditor/lang/lv.js
	MovieProject/WebContent/ckeditor/lang/mk.js
	MovieProject/WebContent/ckeditor/lang/mn.js
	MovieProject/WebContent/ckeditor/lang/ms.js
	MovieProject/WebContent/ckeditor/lang/nb.js
	MovieProject/WebContent/ckeditor/lang/nl.js
	MovieProject/WebContent/ckeditor/lang/no.js
	MovieProject/WebContent/ckeditor/lang/pl.js
	MovieProject/WebContent/ckeditor/lang/pt-br.js
	MovieProject/WebContent/ckeditor/lang/pt.js
	MovieProject/WebContent/ckeditor/lang/ro.js
	MovieProject/WebContent/ckeditor/lang/ru.js
	MovieProject/WebContent/ckeditor/lang/si.js
	MovieProject/WebContent/ckeditor/lang/sk.js
	MovieProject/WebContent/ckeditor/lang/sl.js
	MovieProject/WebContent/ckeditor/lang/sq.js
	MovieProject/WebContent/ckeditor/lang/sr-latn.js
	MovieProject/WebContent/ckeditor/lang/sr.js
	MovieProject/WebContent/ckeditor/lang/sv.js
	MovieProject/WebContent/ckeditor/lang/th.js
	MovieProject/WebContent/ckeditor/lang/tr.js
	MovieProject/WebContent/ckeditor/lang/tt.js
	MovieProject/WebContent/ckeditor/lang/ug.js
	MovieProject/WebContent/ckeditor/lang/uk.js
	MovieProject/WebContent/ckeditor/lang/vi.js
	MovieProject/WebContent/ckeditor/lang/zh-cn.js
	MovieProject/WebContent/ckeditor/lang/zh.js
	MovieProject/WebContent/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
	MovieProject/WebContent/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
	MovieProject/WebContent/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
	MovieProject/WebContent/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
	MovieProject/WebContent/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
	MovieProject/WebContent/ckeditor/plugins/about/dialogs/about.js
	MovieProject/WebContent/ckeditor/plugins/iframe/images/placeholder.png
	MovieProject/WebContent/ckeditor/plugins/image/dialogs/image.js
	MovieProject/WebContent/ckeditor/plugins/link/images/anchor.png
	MovieProject/WebContent/ckeditor/plugins/link/images/hidpi/anchor.png
	MovieProject/WebContent/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
	MovieProject/WebContent/ckeditor/plugins/magicline/images/hidpi/icon.png
	MovieProject/WebContent/ckeditor/plugins/magicline/images/icon-rtl.png
	MovieProject/WebContent/ckeditor/plugins/magicline/images/icon.png
	MovieProject/WebContent/ckeditor/plugins/preview/preview.html
	MovieProject/WebContent/ckeditor/plugins/scayt/LICENSE.md
	MovieProject/WebContent/ckeditor/plugins/scayt/README.md
	MovieProject/WebContent/ckeditor/plugins/scayt/dialogs/toolbar.css
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_address.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_blockquote.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_div.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_h1.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_h2.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_h3.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_h4.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_h5.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_h6.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_p.png
	MovieProject/WebContent/ckeditor/plugins/showblocks/images/block_pre.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/angel_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/angel_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/angry_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/angry_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/broken_heart.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/broken_heart.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/confused_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/confused_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/cry_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/devil_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/embaressed_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/embarrassed_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/embarrassed_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/envelope.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/envelope.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/heart.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/heart.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/kiss.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/kiss.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/lightbulb.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/lightbulb.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/omg_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/omg_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/regular_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/regular_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/sad_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/sad_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/shades_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/shades_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/teeth_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/teeth_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/thumbs_down.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/thumbs_down.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/thumbs_up.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/thumbs_up.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/tongue_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/tongue_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/tounge_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.png
	MovieProject/WebContent/ckeditor/plugins/smiley/images/wink_smile.gif
	MovieProject/WebContent/ckeditor/plugins/smiley/images/wink_smile.png
	MovieProject/WebContent/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
	MovieProject/WebContent/ckeditor/plugins/templates/dialogs/templates.css
	MovieProject/WebContent/ckeditor/plugins/wsc/LICENSE.md
	MovieProject/WebContent/ckeditor/plugins/wsc/README.md
	MovieProject/WebContent/ckeditor/plugins/wsc/dialogs/ciframe.html
	MovieProject/WebContent/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
	MovieProject/WebContent/ckeditor/plugins/wsc/dialogs/wsc.css
	MovieProject/WebContent/ckeditor/samples/ajax.html
	MovieProject/WebContent/ckeditor/samples/api.html
	MovieProject/WebContent/ckeditor/samples/appendto.html
	MovieProject/WebContent/ckeditor/samples/assets/inlineall/logo.png
	MovieProject/WebContent/ckeditor/samples/assets/outputxhtml/outputxhtml.css
	MovieProject/WebContent/ckeditor/samples/assets/posteddata.php
	MovieProject/WebContent/ckeditor/samples/assets/sample.jpg
	MovieProject/WebContent/ckeditor/samples/datafiltering.html
	MovieProject/WebContent/ckeditor/samples/divreplace.html
	MovieProject/WebContent/ckeditor/samples/index.html
	MovieProject/WebContent/ckeditor/samples/inlineall.html
	MovieProject/WebContent/ckeditor/samples/inlinebycode.html
	MovieProject/WebContent/ckeditor/samples/inlinetextarea.html
	MovieProject/WebContent/ckeditor/samples/jquery.html
	MovieProject/WebContent/ckeditor/samples/plugins/dialog/assets/my_dialog.js
	MovieProject/WebContent/ckeditor/samples/plugins/dialog/dialog.html
	MovieProject/WebContent/ckeditor/samples/plugins/enterkey/enterkey.html
	MovieProject/WebContent/ckeditor/samples/plugins/htmlwriter/outputforflash.html
	MovieProject/WebContent/ckeditor/samples/plugins/htmlwriter/outputhtml.html
	MovieProject/WebContent/ckeditor/samples/plugins/magicline/magicline.html
	MovieProject/WebContent/ckeditor/samples/plugins/toolbar/toolbar.html
	MovieProject/WebContent/ckeditor/samples/plugins/wysiwygarea/fullpage.html
	MovieProject/WebContent/ckeditor/samples/readonly.html
	MovieProject/WebContent/ckeditor/samples/replacebyclass.html
	MovieProject/WebContent/ckeditor/samples/replacebycode.html
	MovieProject/WebContent/ckeditor/samples/sample.css
	MovieProject/WebContent/ckeditor/samples/sample.js
	MovieProject/WebContent/ckeditor/samples/sample_posteddata.php
	MovieProject/WebContent/ckeditor/samples/tabindex.html
	MovieProject/WebContent/ckeditor/samples/uicolor.html
	MovieProject/WebContent/ckeditor/samples/uilanguages.html
	MovieProject/WebContent/ckeditor/samples/xhtmlstyle.html
	MovieProject/WebContent/ckeditor/skins/moono/dialog.css
	MovieProject/WebContent/ckeditor/skins/moono/dialog_ie.css
	MovieProject/WebContent/ckeditor/skins/moono/dialog_ie7.css
	MovieProject/WebContent/ckeditor/skins/moono/dialog_ie8.css
	MovieProject/WebContent/ckeditor/skins/moono/dialog_iequirks.css
	MovieProject/WebContent/ckeditor/skins/moono/editor.css
	MovieProject/WebContent/ckeditor/skins/moono/editor_gecko.css
	MovieProject/WebContent/ckeditor/skins/moono/editor_ie.css
	MovieProject/WebContent/ckeditor/skins/moono/editor_ie7.css
	MovieProject/WebContent/ckeditor/skins/moono/editor_ie8.css
	MovieProject/WebContent/ckeditor/skins/moono/editor_iequirks.css
	MovieProject/WebContent/ckeditor/skins/moono/images/arrow.png
	MovieProject/WebContent/ckeditor/skins/moono/images/close.png
	MovieProject/WebContent/ckeditor/skins/moono/images/hidpi/close.png
	MovieProject/WebContent/ckeditor/skins/moono/images/hidpi/lock-open.png
	MovieProject/WebContent/ckeditor/skins/moono/images/hidpi/lock.png
	MovieProject/WebContent/ckeditor/skins/moono/images/hidpi/refresh.png
	MovieProject/WebContent/ckeditor/skins/moono/images/lock-open.png
	MovieProject/WebContent/ckeditor/skins/moono/images/lock.png
	MovieProject/WebContent/ckeditor/skins/moono/images/refresh.png
	MovieProject/WebContent/ckeditor/skins/moono/readme.md
	MovieProject/WebContent/ckeditor/styles.js
	MovieProject/WebContent/content.jsp
	MovieProject/WebContent/js/board.js
	MovieProject/src/movie/dataaccess/MovieDaoImpl.java