Merge branch 'parallel' into proxy

Conflicts:
	src/ru/fizteh/fivt/students/AlexeyZhuravlev/parallel/ParallelTableProvider.java