Merge pull request #129 from jtwigg/develop

Develop
Updates Cocos2d
Fixes import of .bmfont and displays them in the file view
Fixes icons for bm-fonts
gm-fonts kind of works, but are not correctly displayed in iPad
Fix keyframes getting corrupted.
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop