conflicts resolved - view everything favorite working
Merge pull request #12 from lalogf/master

conflicts resolved - view everything favorite working