modified:   appCode/keymaps/poplax_2.xml
	modified:   appCode/templates/Objective_C.xml
Merge branch 'master' of https://github.com/poplax/poplaxCodeSPMac

Conflicts:
	appCode/templates/Objective_C.xml

	modified:   FontAndColorThemes/poplax-small.dvtcolortheme
	modified:   appCode/codestyles/poplax.xml