updated my xcode
Merge remote-tracking branch 'origin'
Class name change from CCharacter to CActor