Merge branch 'master' into core-restructure

# Conflicts:
#	documize/api/endpoint/router.go

core/api/util/gorilla.go

@@ -0,0 +1,23 @@
+// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
+//
+// This software (Documize Community Edition) is licensed under
+// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
+//
+// You can operate outside the AGPL restrictions by purchasing
+// Documize Enterprise Edition and obtaining a commercial license
+// by contacting <sales@documize.com>.
+//
+// https://documize.com
+
+package util
+
+import (
+	"net/http"
+
+	"github.com/gorilla/mux"
+)
+
+// Params returns the paramaters to a gorilla mux request.
+func Params(r *http.Request) map[string]string {
+	return mux.Vars(r)
+}