mis cambios
Merge branch 'master' of https://github.com/uuZ/IDP

Conflicts:
	hsqldb/data/idp.log
	hsqldb/data/idp.properties
Merge branch 'master' of https://github.com/uuZ/IDP
añadido parte de mapping