Fixing merge
Changing name of .properties and .plist files to be project.properties and project.plist.