Merge pull request #5 from cocos2d/develop

update my develop branch.
Fix warnings in CocosBuilder.
Merge branch 'fix_warnings' of https://github.com/ayuer/CocosBuilder into develop

Conflicts:
	CocosBuilder/CocosBuilder.xcodeproj/project.pbxproj