改些琐碎的bug
Merge branch 'beta_version2' of github.com:1haoting/beta into beta_version2

Conflicts:
	application/controllers/MovieDetail.php
	application/models/cinema_model.php
	application/models/now_playing_movie.php
	application/views/templates/cinema_list.html