modified:   CodeSnippets/7C58FA74-41E0-47CB-B661-CC14C1CB1723.codesnippet
	modified:   CodeSnippets/EC5E7B33-6F3B-4526-AADF-E91030BB9E30.codesnippet
Merge branch 'master' of https://github.com/poplax/poplaxCodeSPMac

Conflicts:
	CodeSnippets/7C58FA74-41E0-47CB-B661-CC14C1CB1723.codesnippet

	modified:   7C58FA74-41E0-47CB-B661-CC14C1CB1723.codesnippet
	modified:   9686F1D3-A379-4930-AE22-7101D6118014.codesnippet
	renamed:    ../themes/Ciapre 2.dvtcolortheme -> ../FontAndColorThemes/Ciapre 2.dvtcolortheme
	renamed:    ../themes/Ciapre Blue.dvtcolortheme -> ../FontAndColorThemes/Ciapre Blue.dvtcolortheme
	renamed:    ../themes/Ciapre.dvtcolortheme -> ../FontAndColorThemes/Ciapre.dvtcolortheme
	renamed:    ../themes/Default.dvtcolortheme -> ../FontAndColorThemes/Default.dvtcolortheme
	renamed:    ../themes/Midnight.dvtcolortheme -> ../FontAndColorThemes/Midnight.dvtcolortheme
	renamed:    ../themes/PoPlax-Company.dvtcolortheme -> ../FontAndColorThemes/PoPlax-Company.dvtcolortheme
	renamed:    ../themes/poplax-Ciapre-Blue.dvtcolortheme -> ../FontAndColorThemes/poplax-Ciapre-Blue.dvtcolortheme
	renamed:    ../themes/poplax-small.dvtcolortheme -> ../FontAndColorThemes/poplax-small.dvtcolortheme
	renamed:    ../themes/poplax.dvtcolortheme -> ../FontAndColorThemes/poplax.dvtcolortheme
	renamed:    ../themes/poplax2.dvtcolortheme -> ../FontAndColorThemes/poplax2.dvtcolortheme
	renamed:    ../themes/poplax3.dvtcolortheme -> ../FontAndColorThemes/poplax3.dvtcolortheme
	renamed:    ../themes/poplax4.dvtcolortheme -> ../FontAndColorThemes/poplax4.dvtcolortheme
	modified:   ../setup_xcode_codeSnippets.sh