update
Merge branch 'master' of https://github.com/cpk/ckmn_filemanager

Conflicts:
	uploads/16494703e029373a1884fca1857af93a.file
	uploads/2825bd4e9234081da717523d955db25c.file
	uploads/dda77d95e6913a56cc98cf317e1aefb8.file
	uploads/dea1292991ff1a910d11e8e3bf416f95.file
	uploads/ffc2b1fd23a2beca8518b84be4700699.file