Merge pull request #278 from mono/master

Changes to clean up code after merge
fixed tests link back to the origin repo.
updated content and fix for marker felt font that is missing for the ccb tests.
IOS content update.
Merge pull request #280 from Cocos2DXNA/CCB_FONT_FIX

updated content and fix for marker felt font that is missing for the ccb tests