Fixing project.xml
Merge origin/master
Fixing project.xml