Fixed flag for convo
Merge branch 'master' into fixes
Hide the flag spark link if it is your spark