Pull request

Normally it should be better this time. The only problem I still see I that the headers of our .xml files are not formated the same way, so it mark them as different while the content is the same.