Merge branch 'master' into release/1.3.7

Author: Anthony Dresser

package.json

@@ -20,7 +20,7 @@
     "@angular/platform-browser-dynamic": "^4.1.3",
     "@angular/router": "^4.1.3",
     "@angular/upgrade": "^4.1.3",
-    "slickgrid": "github:anthonydresser/SlickGrid#2.3.7",
+    "slickgrid": "github:anthonydresser/SlickGrid#2.3.12",
     "core-js": "^2.4.1",
     "moment": "^2.15.1",
     "reflect-metadata": "^0.1.8",
@@ -53,7 +53,7 @@
     "moment": "^2.15.1",
     "reflect-metadata": "^0.1.8",
     "rxjs": "^5.4.0",
-    "slickgrid": "github:anthonydresser/SlickGrid#2.3.7",
+    "slickgrid": "github:anthonydresser/SlickGrid#2.3.12",
     "systemjs": "0.19.40",
     "tsc": "^1.20150623.0",
     "tslint": "^3.14.0",