Use tos_url site setting in flag modal if it's set
Merge branch 'master' into feature/arenas