Merge remote-tracking branch 'origin/master'

# Conflicts:
#	demo/simple-form.html
#	demo/simple-put.html
#	demo/sts-form.html
#	demo/sts-post.html
#	demo/sts-put.html

Author: carsonxu

demo/sts-post/simple-post.html

@@ -57,7 +57,7 @@ <h1>Ajax Post 上传</h1>
 
         // 上传文件
         var uploadFile = function (file, callback) {
-            var Key = file.name;
+            var Key = 'dir/' + file.name; // 这里指定上传路径
 
             getAuthorization({Method: 'POST', Key: Key}, function (err, info) {
                 var auth = info.Authorization;
@@ -104,4 +104,4 @@ <h1>Ajax Post 上传</h1>
 </script>
 
 </body>
-</html>
+</html>