Merge "Moved configuration from string.xml to config.xml"