Close #391
Merge branch 'master' of github.com:geosolutions-it/fra2015