changed arrayList required sport objects on the idTypeRequiredSportObject
added method athleteCollision and method allSportObjectOnTypeId
 added method athleteCollision and method allSportObjectOnTypeId
changed arrayList required sport objects on the idTypeRequiredSportObject
Update shared.iml

Проект теперь нормально собирается.
P.S. специально для Ромы =)
временные изменения
Added wait activity
added getting appliationCons
AskForWaitActivity теперь не может быть закрыто пользователем.
Merge pull request #26 from MOHAX239/master

methods for Roman (athleteCollision and allSportObjectsByType) and changed Competition
все измененные файлы. для Тоши
Merge pull request #27 from danyaberezun/master

Abracadabra
Competition вынесен в отдельный класс, называесый ClientCompetition
удалён старый Competition
for automatoc merge
Merge branch 'master' of https://github.com/anlun/olympIS

Conflicts:
	shared/shared.iml
	shared/src/beans/Competition.java
Merge pull request #28 from danyaberezun/master

Competition вынесен в отдельный класс CompetitionList
Fixed problem with Application post to client.
Start working on filter send.
Renewed ALL FILES