Merge branch 'selectAlly'

* selectAlly:
  Add selection of allies