support folder uplading with Google Chrome
Merge branch '2.1' into 2.1_n