Merge branch 'master' of https://github.com/dkomanov/fizteh-java-2013 into Parallel

Conflicts:
	src/ru/fizteh/fivt/students/anastasyev/filemap/FileMapTable.java
	src/ru/fizteh/fivt/students/anastasyev/filemap/tests/FileMapTableTest.java