Cosmetix
updated localization
Merge Master