Merge pull request #464 from afabiani/c015

C015
Merge branch 'c015' of https://github.com/geosolutions-it/MapStore into c015
 - AOI updates