fixing the single show flag for friends
Merge branch 'master' of heroku.com:bpopv2

remote repos and local repos merge

merging remote and local master