Merge branch 'master' of https://github.com/tak723sio/HALCinema

Conflicts:
	tokyo/reserve/finish.php
a