Delete project.properties
Delete project.xml
Merge master into build