Merge remote-tracking branch 'origin/2017.03.00'

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - 4
 script: npm run travis
-addons:  
+addons:
   firefox: latest
 before_install:
     - export DISPLAY=:99.0
@@ -12,3 +12,4 @@ before_install:
 branches:
   only:
     - master
+    - /^\d{4}\.\d{2}.\d{2}$/

package.json

@@ -170,7 +170,7 @@
   "scripts": {
     "doc": "docma -c docma-config.json --dest web/docs",
     "cleandoc": "rimraf web/docs && rimraf web/client/mapstore/docs",
-    "doctest": "docma -c docma-config.json --dest web/client/mapstore/docs && echo documentation is accessible from the mapstore/docs path when running start sript",
+    "doctest": "docma -c docma-config.json --dest web/client/mapstore/docs && echo documentation is accessible from the mapstore/docs path when running npm start",
     "postinstall": "node checkCesium.js && mkdirp ./web/client/libs/Cesium && download --extract --out ./web/client/libs/Cesium https://cesiumjs.org/releases/Cesium-1.17.zip || echo Cesium already installed",
     "clean": "rimraf ./web/client/dist",
     "compile": "npm run clean && mkdirp ./web/client/dist && webpack --progress --config prod-webpack.config.js",

web/client/components/buttons/FullScreenButton.jsx

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2017, GeoSolutions Sas.
  * All rights reserved.
  *

web/client/components/plugins/PluginsContainer.jsx

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016, GeoSolutions Sas.
  * All rights reserved.
  *