Update Xcode 6 files, avoid double files in plugins and core