change junit test case
add operation of menu

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   .gitignore
	modified:   .mymetadata
	modified:   .project
	modified:   .settings/org.eclipse.wst.common.component
	modified:   pom.xml
	new file:   src/main/java/cn/sh/sbl/hotel/service/IFilmService.java
	new file:   src/main/java/cn/sh/sbl/hotel/service/impl/FilmService.java
	new file:   src/main/java/cn/sh/sbl/hotel/service/impl/MenuService.java
	new file:   src/main/java/cn/sh/sbl/hotel/vo/DirectorVo.java
	new file:   src/main/java/cn/sh/sbl/hotel/vo/FileVo.java
	modified:   src/main/java/cn/sh/sbl/hotel/vo/FilmVo.java
	modified:   src/main/java/cn/sh/sbl/hotel/vo/MenuVo.java
	modified:   src/main/java/cn/sh/sbl/hotel/web/action/TerminalController.java
	modified:   src/main/resources/config.properties
	modified:   src/main/resources/log4j.xml
	modified:   src/main/webapp/WEB-INF/web.xml
	modified:   src/test/java/junit/test/action/TerminalControllerTest.java
Merge branch 'master' of https://github.com/cocosvsn/demo

Conflicts:
	.gitignore
	.project
	.settings/org.eclipse.wst.common.component
	pom.xml
	src/main/webapp/WEB-INF/web.xml