Merge pull request #272 from BuracayBeach/team2_v5.5

Team2 v5.5
fixed SQL preloading data of favorites
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v5.5