Merge branch 'master' into storage_refactor

pwd/pwd.go

@@ -1,6 +1,7 @@
 package pwd
 
 import (
+	"io"
 	"time"
 
 	"github.com/play-with-docker/play-with-docker/docker"
@@ -60,6 +61,7 @@ type PWDApi interface {
 	InstanceResizeTerminal(instance *types.Instance, cols, rows uint) error
 	InstanceAttachTerminal(instance *types.Instance) error
 	InstanceUploadFromUrl(instance *types.Instance, url string) error
+	InstanceUploadFromReader(instance *types.Instance, filename string, reader io.Reader) error
 	InstanceGet(session *types.Session, name string) *types.Instance
 	InstanceFindByIP(ip string) *types.Instance
 	InstanceFindByAlias(sessionPrefix, alias string) *types.Instance