Delete project.properties
Delete project.xml
Merge branch 'develop'