add sort ot favourites
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project into Sort
Fixed sort by Favourite
Change sort by favourites to sort when same
changed to sort by date if both if both not in favourites did this for user as well
Merge pull request #130 from CMPUT301F14T14/Sort

Sort by favourites