diff --git a/web/web.go b/web/web.go
index <HASH>..<HASH> 100644
--- a/web/web.go
+++ b/web/web.go
@@ -9,7 +9,9 @@ import (
 	"crypto/sha1"
 	"encoding/base64"
 	"fmt"
-	"github.com/codegangsta/martini"
+	// When do the merges, should correct the import path
+	// or martini.Context would not be correctly injected
+	"github.com/Archs/martini"
 	"io/ioutil"
 	"mime"
 	"net/http"
diff --git a/web/web_test.go b/web/web_test.go
index <HASH>..<HASH> 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -1,7 +1,9 @@
 package web
 
 import (
-	"github.com/codegangsta/martini"
+	// When do the merges, should correct the import path
+	// or martini.Context would not be correctly injected
+	"github.com/Archs/martini"
 	"net/http"
 	"net/http/httptest"
 	"testing"
update web to work with new martini route method: Any