Merge pull request #1 from dmi3yy/master

master
Merge pull request #109 from bumkaka/develop

Develop
fix ddselectdocuments
Revert "fix ddselectdocuments"

This reverts commit a161c15a6744ff44800f0b99f6c8efb1a9968c79.
update from 1.0.13bugfix
Merge branch 'master' into develop

* master:
  update from 1.0.13bugfix
  Revert "fix ddselectdocuments"
  fix ddselectdocuments

Conflicts:
	manager/includes/version.inc.php
$virtualDir= $this->config['virtual_dir'];
Merge branch 'master' into develop

* master:
  $virtualDir= $this->config['virtual_dir'];
fix from 1.0.13bugfix
Merge branch 'master' into develop

* master:
  fix from 1.0.13bugfix
fix
fix from 1.0.13bugfix
Merge branch 'master' into develop

* master:
  fix from 1.0.13bugfix
fix padding in tinymce with  D3X theme
fix   tiny_mce padding in menu for D3X theme
Merge branch 'master' into develop

* master:
  fix   tiny_mce padding in menu for D3X theme
fix from 1.0.13bugfix
Merge branch 'master' into develop

* master:
  fix from 1.0.13bugfix

Conflicts:
	manager/includes/version.inc.php
OnFileBrowserUpload event in KCFinder
Merge pull request #114 from Pathologic/master

OnFileBrowserUpload event in KCFinder