ln：获取城市列表和上映时间标签
Merge branch 'master' of https://github.com/TuanFou/TuanFou.git

Conflicts:
	src/com/tuanfou/dao/GroupFilmDao.java
	src/com/tuanfou/test/GroupFilmDaoTest.java
Merge branch 'master' of https://github.com/TuanFou/TuanFou.git