close #260 . close #249
Merge branch 'master' of github.com:geosolutions-it/mapstore