Move xml constants to XmlConst
Manage resources. Now locale is defined in Locale.properties
Merge
Slight changes