add new file 2
add new file
Merge branch 'master' into beta_version2

Conflicts:
	application/models/cinema_model.php