Merge branch 'master' into standalone-server

Conflicts:
	lib/cartodb/controllers/named_static_maps.js

NEWS.md

@@ -1,10 +1,17 @@
 # Changelog
 
-## 2.12.1
+## 2.13.1
 
 Released 2015-mm-dd
 
 
+## 2.13.0
+
+Released 2015-09-21
+
+New features:
+ - Keep x-cache-channel in named map static maps
+
 
 ## 2.12.0
 

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.12.1",
+  "version": "2.13.1",
   "dependencies": {
     "body-parser": {
       "version": "1.14.0",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.12.1",
+    "version": "2.13.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"