merging fix from multisite branch for bug hiding favs from other people
merging fix from multisite branch for bug hiding favs from other people

git-svn-id: da4412af14a96408d63d6e9521facd6ba26d831b@498 88fc0095-4724-0410-ab6c-c99dba55acc4

powerchurch/onebody,fadiwissa/onebody,ebennaga/onebody,ferdinandrosario/onebody,dorman/onebody,hooray4me/onebody2,moss-zc/sns_shop,0612800232/sns_shop,pgmcgee/onebody,kevinjqiu/onebody,Capriatto/onebody,brunoocasali/onebody,Capriatto/onebody,pgmcgee/onebody,powerchurch/onebody,ferdinandrosario/onebody,hooray4me/onebody,ebennaga/onebody,mattraykowski/onebody,klarkc/onebody,moss-zc/sns_shop,cessien/onebody,AVee/onebody,cessien/onebody,moss-zc/sns_shop,ebennaga/onebody,tmecklem/onebody,klarkc/onebody,acbilimoria/onebody,fadiwissa/onebody,klarkc/onebody,brunoocasali/onebody,fadiwissa/onebody,davidleach/onebody,tochman/onebody,hschin/onebody,hschin/onebody,acbilimoria/onebody,ferdinandrosario/onebody,mattraykowski/onebody,kevinjqiu/onebody,0612800232/sns_shop,tochman/onebody,nerdnorth/remote-workers-app,samuels410/church-portal,dorman/onebody,powerchurch/onebody,pgmcgee/onebody,hooray4me/onebody,hschin/onebody,samuels410/church-portal,cessien/onebody,AVee/onebody,tochman/onebody,moss-zc/sns_shop,hschin/onebody,tmecklem/onebody,mattraykowski/onebody,nerdnorth/remote-workers-app,tmecklem/onebody,calsaviour/onebody,hooray4me/onebody2,AVee/onebody,seethemhigh/onebody,brunoocasali/onebody,powerchurch/onebody,kevinjqiu/onebody,mattraykowski/onebody,ebennaga/onebody,AVee/onebody,seethemhigh/onebody,tochman/onebody,acbilimoria/onebody,davidleach/onebody,ferdinandrosario/onebody,calsaviour/onebody,seethemhigh/onebody,acbilimoria/onebody,hooray4me/onebody,hooray4me/onebody,moss-zc/sns_shop,davidleach/onebody,fadiwissa/onebody,nerdnorth/remote-workers-app,nerdnorth/remote-workers-app,calsaviour/onebody,dorman/onebody,davidleach/onebody,pgmcgee/onebody,klarkc/onebody,Capriatto/onebody,calsaviour/onebody,hooray4me/onebody2,Capriatto/onebody,0612800232/sns_shop,hooray4me/onebody2,cessien/onebody,brunoocasali/onebody,seethemhigh/onebody,kevinjqiu/onebody,tmecklem/onebody,dorman/onebody