Delete project.properties
Delete project.xml
Delete project.properties
Delete project.xml
Merge branch 'develop'
Merge master into 1.0