modified ccplatform config since otherwise i can't get my application to build
Merge branch 'osxcompatable' of github.com:brooklynpacket/cocos2d-x into osxcompatable

Conflicts:
	cocos2dx/platform/CCPlatformConfig.h
updated cocos to use font styles properly on osx
fixed an issue where labelbounds are messed up on osx
it looks like this is supposed to be top aligned by default