Merge branch 'refs/heads/master' into develop

Conflicts:
	framework/CorePlot.xcodeproj/project.pbxproj
	framework/Source/CPColor.m
Merge branch 'master' of github.com:nothirst/core-plot