- merge latest changes of phase I
Merge branch 'master-changematrix' of https://github.com/afabiani/geoserver into master-changematrix
Little modifications on ChangeMatrix
Merged some modifications on changemat