add new file
Merge branch 'master' of https://github.com/1haoting/beta

Conflicts:
	application/config/routes.php
	application/models/cinema_model.php