When to show challenge user and to show who challenged whom
Merge branch 'devBranch'

* devBranch:
  When to show challenge user and to show who challenged whom