fixed bugs in Database
Merge pull request #47 from MOHAX239/master

поправил баги в БД
Merge branch 'master' of https://github.com/MOHAX239/olympIS
fixed bugs in db
Merge pull request #48 from MOHAX239/master

поправил баги в БД
Merge branch 'master' of https://github.com/MOHAX239/olympIS
fixed bug
Merge pull request #49 from MOHAX239/master

fixed bug
Fixed DB-bugs and tested plan DB-export
Merge branch 'master' of https://github.com/anlun/olympIS

Conflicts:
	server/src/server/Database.java
Fixed bugs in PlanGenerator.java