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
Inserted spaces before brackets
Merge branch 'master' of https://github.com/anlun/olympIS
Start working on filter send.
Renewed ALL FILES
Merge branch 'master' of https://github.com/anlun/olympIS

Conflicts:
	server/src/ApplicationPostResponseCreator.java
	server/src/Database.java
	server/src/ServerConsoleWrapper.java
	shared/src/beans/Competition.java
Work on filter response.
Moved Everything to package in server/src
Continue working
Renewed some comments in PlanGenerator.java
Merge branch 'master' of https://github.com/anlun/olympIS

Conflicts:
	server/src/server/ServerConsoleWrapper.java
Fixed
Merge pull request #19 from romos/master

Добавлен класс PlanGenerator. Немного подкорректирован класс Competition
add methods countryApplication, insertInathlets
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server/src/server/Database.java
Continue working
Merge pull request #30 from MOHAX239/master

добавил countryApplication в базу, добавление и выдачу...
Merge remote-tracking branch 'origin/master'

* origin/master:
  add methods countryApplication, insertInathlets