kongdefeiL:修改团购电影详细信息显示页
Merge branch 'master' of https://github.com/TuanFou/TuanFou.git

Conflicts:
	src/com/tuanfou/test/GroupFilmDaoTest.java