fix resourse.php
Merge pull request #118 from yama/develop

Refactor - Main menu in manager
fix missing argument in menu
fix  removelocks in FF
1.1b-d7.0.5
fix from 1.0.13
Merge branch 'master' into develop

* master:
  fix from 1.0.13
  fix resourse.php
add .tpl for edit from fileManager
Merge branch 'master' into develop

* master:
  add .tpl for edit from fileManager
Fix OnFileBrowserUpload

Для существующего файла в событие отправлялось его имя до переименования.
Merge pull request #120 from Pathologic/patch-1

Fix OnFileBrowserUpload
update to 1.0.14-d6.9
Merge branch 'master' into develop

* master:
  update to 1.0.14-d6.9

Conflicts:
	manager/includes/version.inc.php
AliasListing only for Folders  - on/off in  settings(Friendly URL tab)
version 1.1b-d7.0.7
fix from 1.0.14
Merge branch 'master' into develop

* master:
  fix from 1.0.14
fix mistake for aliasListingFolder
fix for AliasListingFolder