A little more.
A little more.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ru/fizteh/fivt/students/fedoseev/filemap/AbstractFileMap.java
A little more.