Live check begin
Merge branch 'master' of https://github.com/watchthemoon/PhpProject

Conflicts:
	application/models/m_reserve.php