merge
Merge branch 'c022' of https://github.com/afabiani/mapstore into c022
 - fixes and improvements for ChgMatrix Phase II