Merge branch '2.x' into 2.1
fix error with empty folder uploading on Google Chrome
fix problem of DnD, clipboard uploading with Google Chrome
Merge branch '2.x' into 2.1
Merge branch '2.x' into 2.1
Merge branch '2.x' into 2.1
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.1
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.1
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.1
Merge branch '2.x' into 2.x_n
[ui:cwd] fix problem of DnD, clipboard uploading with IE10, 11
[ui:cwd] fix problem of DnD, clipboard uploading with IE10, 11
Merge branch '2.1' into 2.1_n

Conflicts:
	js/ui/cwd.js
Merge branch '2.x_n' into 2.1_n