Merge remote-tracking branch 'origin/fox' into bonobono

Conflicts:
	MovieProject/WebContent/WEB-INF/web.xml
	MovieProject/WebContent/css/board.css
	MovieProject/WebContent/notice.jsp
board.js 파일 추가 및 수정
??
Merge branch 'bonobono' of
https://github.com/MovieProject/mad-animal.git into bonobono

Conflicts:
	MovieProject/WebContent/notice.jsp
	MovieProject/WebContent/writeForm.jsp
조촐한 수정
Merge pull request #31 from MovieProject/fox

Fox
Merge pull request #31 from MovieProject/fox

Fox
Merge branch 'master' of https://github.com/MovieProject/mad-animal.git
Merge remote-tracking branch 'origin/master' into bonobono
Merge remote-tracking branch 'origin/master' into bonobono
Merge branch 'bonobono' of
https://github.com/MovieProject/mad-animal.git into bonobono
Merge remote-tracking branch 'origin/fox' into bonobono
Merge remote-tracking branch 'origin/fox' into bonobono

Conflicts:
	MovieProject/WebContent/BoardList/week_Recommend.jsp
	MovieProject/WebContent/css/board.css
Merge remote-tracking branch 'origin/bonobono' into fox