Merge remote-tracking branch 'origin/fox'
MemberController구현 중
Merge remote-tracking branch 'origin/bonobono' into fox

Conflicts:
	MovieProject/src/movie/web/controller/MemberController.java
member 및  movie수정
MemberController login logout 작성완료
web.xml및 context.xml수정
Merge remote-tracking branch 'origin/fox' into bonobono

Conflicts:
	MovieProject/WebContent/META-INF/context.xml
	MovieProject/WebContent/WEB-INF/web.xml