Closes #338 and #296
Merge branch 'master' of https://github.com/geosolutions-it/fra2015