Fixed merge conflict
Other tasks removed
Small fix in tests
Merge branch 'master' into Storeable
Merge branch 'master' into JUnit
finally without merge conflicts
fixed
Added JUnit
Merge remote-tracking branch 'remotes/origin/Storeable' into Parallel
Merge remote-tracking branch 'remotes/origin/JUnit' into Parallel

Conflicts:
	src/ru/fizteh/fivt/students/pershik/Storeable/StoreableTableMain.java
Merge branch 'Parallel' into Proxy
Merge remote-tracking branch 'remotes/origin/JUnit' into Parallel

Conflicts:
	src/ru/fizteh/fivt/students/pershik/Storeable/StoreableTableMain.java