Added PlanGenerator class. Competition class supplemented.
Added competition test set. Class Competition moved to /server/src/
Merge branch 'master' of https://github.com/anlun/olympIS
Now compilable.
Competition to JavaBean
Missed file
Missed library
Inserted spaces before brackets
Merge branch 'master' of https://github.com/anlun/olympIS
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
все измененные файлы. для Тоши