MAke Colors and Attribute labels translatable
Merge branch 'master' of ssh://git@github.com/atarba/mdm.git

Conflicts:
	src/com/mrg/mdm/data/DAProduct.cls
	src/com/mrg/mdm/test/TCSISAArticle.cls