Truth or Dare - Changed 'name reset' to 'edit names'
Merge branch 'master' of ssh://gloo.fraboom.com/home/gloo/stage