影院详情
Merge branch 'beta_version2' of https://github.com/1haoting/beta into beta_version2

Conflicts:
	application/config/routes.php