Merge branch 'master' of https://github.com/ingadhoc/odoo-law-tracking

Conflicts:
	addons/law_tracking/i18n/es.po
TRANSLATION Provincia por Situacion