modified:   appCode/options/appComponentVersions.xml
	modified:   appCode/options/browsers.xml
	modified:   appCode/options/notifications.xml
	modified:   appCode/options/options.xml
	modified:   appCode/options/other.xml
	modified:   appCode/options/statistics.application.usages.xml
Merge branch 'master' of https://github.com/poplax/poplaxCodeSPMac

Conflicts:
	appCode/options/appComponentVersions.xml
	appCode/options/browsers.xml
	appCode/options/notifications.xml
	appCode/options/options.xml
	appCode/options/other.xml
	appCode/options/statistics.application.usages.xml

	new file:   CodeSnippets/713058CE-B9AF-4B12-A05B-CCC692D9BA9C.codesnippet
	modified:   appCode/options/appComponentVersions.xml
	modified:   appCode/options/browsers.xml
	modified:   appCode/options/editor.xml
	modified:   appCode/options/feature.usage.statistics.xml
	modified:   appCode/options/ide.general.xml
	modified:   appCode/options/notifications.xml
	modified:   appCode/options/options.xml
	modified:   appCode/options/other.xml
	modified:   appCode/options/runner.layout.xml
	modified:   appCode/options/statistics.application.usages.xml
	modified:   appCode/options/stubIndex.xml
	modified:   appCode/options/ui.lnf.xml
	modified:   appCode/options/window.manager.xml
	modified:   appCode/templates/Objective_C.xml
	deleted:    appCode/options/appComponentVersions.xml
	deleted:    appCode/options/browsers.xml
	deleted:    appCode/options/cachedDictionary.xml
	deleted:    appCode/options/code.style.schemes.xml
	deleted:    appCode/options/colors.scheme.xml
	deleted:    appCode/options/editor.codeinsight.xml
	deleted:    appCode/options/editor.xml
	deleted:    appCode/options/encoding.xml
	deleted:    appCode/options/feature.usage.statistics.xml
	deleted:    appCode/options/file.template.settings.xml
	deleted:    appCode/options/filetypes.xml
	deleted:    appCode/options/github_settings.xml
	deleted:    appCode/options/ide.general.xml
	deleted:    appCode/options/images.support.xml
	deleted:    appCode/options/intentionSettings.xml
	deleted:    appCode/options/keymap.xml
	deleted:    appCode/options/new_xcode_project.xml
	deleted:    appCode/options/notifications.xml
	deleted:    appCode/options/options.xml
	deleted:    appCode/options/other.xml
	deleted:    appCode/options/plugin_ui.xml
	deleted:    appCode/options/project.default.xml
	deleted:    appCode/options/runner.layout.xml
	deleted:    appCode/options/security.xml
	deleted:    appCode/options/statistics.application.usages.xml
	deleted:    appCode/options/stubIndex.xml
	deleted:    appCode/options/template.settings.xml
	deleted:    appCode/options/ui.lnf.xml
	deleted:    appCode/options/usage.statistics.xml
	deleted:    appCode/options/vcs.xml
	deleted:    appCode/options/window.manager.xml
	modified:   setup_xcode_codeSnippets.sh