fixed
fixed

Conflicts:
	bs-admin/module/filemanager/config/tree_config.php