Merging with master & resolving merge conflicts

resolving them poorly
removing duplicate shared xcshemes
resolving build errors brought on by new PLCrashReporter code