modified:   appCode/keymaps/poplax_2.xml
	modified:   appCode/options/appComponentVersions.xml
	modified:   appCode/options/browsers.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/statistics.application.usages.xml
Merge branch 'master' of https://github.com/poplax/poplaxCodeSPMac

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

	modified:   appCode/codestyles/poplax.xml
	modified:   appCode/colors/poplax.icls
	modified:   appCode/fileTemplates/includes/Objective-C File Header.m
	modified:   appCode/keymaps/poplax_2.xml
	modified:   appCode/options/appComponentVersions.xml
	modified:   appCode/options/browsers.xml
	modified:   appCode/options/cachedDictionary.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/statistics.application.usages.xml
	modified:   appCode/options/stubIndex.xml
	modified:   appCode/options/ui.lnf.xml
	modified:   appCode/templates/Objective_C.xml
	modified:   appCode/templates/Objective_C.xml