Preparing the app for the merge of diferent kind of files instead of just strings.xml