0936
0937

Conflicts:
	application/controllers/Restaurant.php
Merge branch 'master' of https://github.com/joojieman/dineinlater