ELKTeam+Client
ListOfTeams
Merge branch 'master' of https://github.com/elisapp/eliskit

Conflicts:
	ElisKit/ELKClient+Tournament.h
	ElisKit/ELKClient+Tournament.m