added a comment block around the font change
Merge branch 'osx-font' into osxcompatable

Conflicts:
	cocos2dx/platform/mac/CCImage.mm