finalized favorites and reserve
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into v1.9

Conflicts:
	application/controllers/book.php
	application/models/reserve_model.php
Merge pull request #71 from BuracayBeach/v1.9

V1.9