#113 fixes
Merge branch 'refactor' of github.com:geosolutions-it/fra2015 into refactor