Merge branch 'master' of https://github.com/rbkloss/dcc_fs

Conflicts:
	fs.c
	utils.h