merge latest qgis web client commits to master

getting latest commits from qgis web client