first
commit second
light refactor
Merge remote-tracking branch 'origin' into develop

Conflicts:
	Classes/DragDropAppDelegate.m
	Classes/RootViewController.m
	Resources/Default.png
	Resources/Icon.png
	Resources/Info.plist
	Resources/fps_images.png
	libs/CocosDenshion/CDAudioManager.h
	libs/CocosDenshion/CDAudioManager.m
	libs/CocosDenshion/CDConfig.h
	libs/CocosDenshion/CDOpenALSupport.h
	libs/CocosDenshion/CDOpenALSupport.m
	libs/CocosDenshion/CocosDenshion.h
	libs/CocosDenshion/CocosDenshion.m
	libs/CocosDenshion/SimpleAudioEngine.h
	libs/CocosDenshion/SimpleAudioEngine.m
	libs/FontLabel/FontLabel.h
	libs/FontLabel/FontLabel.m
	libs/FontLabel/FontLabelStringDrawing.h
	libs/FontLabel/FontLabelStringDrawing.m
	libs/FontLabel/FontManager.h
	libs/FontLabel/FontManager.m
	libs/FontLabel/ZAttributedString.h
	libs/FontLabel/ZAttributedString.m
	libs/FontLabel/ZAttributedStringPrivate.h
	libs/FontLabel/ZFont.h
	libs/FontLabel/ZFont.m
	libs/cocos2d/CCAction.h
	libs/cocos2d/CCAction.m
	libs/cocos2d/CCActionCamera.h
	libs/cocos2d/CCActionCamera.m
	libs/cocos2d/CCActionEase.h
	libs/cocos2d/CCActionEase.m
	libs/cocos2d/CCActionGrid.h
	libs/cocos2d/CCActionGrid.m
	libs/cocos2d/CCActionGrid3D.h
	libs/cocos2d/CCActionGrid3D.m
	libs/cocos2d/CCActionInstant.h
	libs/cocos2d/CCActionInstant.m
	libs/cocos2d/CCActionInterval.h
	libs/cocos2d/CCActionInterval.m
	libs/cocos2d/CCActionManager.h
	libs/cocos2d/CCActionManager.m
	libs/cocos2d/CCActionPageTurn3D.h
	libs/cocos2d/CCActionPageTurn3D.m
	libs/cocos2d/CCActionProgressTimer.h
	libs/cocos2d/CCActionProgressTimer.m
	libs/cocos2d/CCActionTiledGrid.h
	libs/cocos2d/CCActionTiledGrid.m
	libs/cocos2d/CCActionTween.h
	libs/cocos2d/CCActionTween.m
	libs/cocos2d/CCAtlasNode.h
	libs/cocos2d/CCAtlasNode.m
	libs/cocos2d/CCBlockSupport.h
	libs/cocos2d/CCBlockSupport.m
	libs/cocos2d/CCCamera.h
	libs/cocos2d/CCCamera.m
	libs/cocos2d/CCConfiguration.h
	libs/cocos2d/CCConfiguration.m
	libs/cocos2d/CCDirector.h
	libs/cocos2d/CCDirector.m
	libs/cocos2d/CCDrawingPrimitives.h
	libs/cocos2d/CCDrawingPrimitives.m
	libs/cocos2d/CCGrabber.h
	libs/cocos2d/CCGrabber.m
	libs/cocos2d/CCGrid.h
	libs/cocos2d/CCGrid.m
	libs/cocos2d/CCLabelAtlas.h
	libs/cocos2d/CCLabelAtlas.m
	libs/cocos2d/CCLabelBMFont.h
	libs/cocos2d/CCLabelTTF.h
	libs/cocos2d/CCLabelTTF.m
	libs/cocos2d/CCLayer.h
	libs/cocos2d/CCLayer.m
	libs/cocos2d/CCMenu.h
	libs/cocos2d/CCMenu.m
	libs/cocos2d/CCMenuItem.h
	libs/cocos2d/CCMenuItem.m
	libs/cocos2d/CCMotionStreak.h
	libs/cocos2d/CCMotionStreak.m
	libs/cocos2d/CCNode.h
	libs/cocos2d/CCNode.m
	libs/cocos2d/CCParallaxNode.h
	libs/cocos2d/CCParallaxNode.m
	libs/cocos2d/CCParticleExamples.h
	libs/cocos2d/CCParticleExamples.m
	libs/cocos2d/CCParticleSystem.h
	libs/cocos2d/CCParticleSystem.m
	libs/cocos2d/CCParticleSystemPoint.h
	libs/cocos2d/CCParticleSystemPoint.m
	libs/cocos2d/CCParticleSystemQuad.h
	libs/cocos2d/CCProgressTimer.h
	libs/cocos2d/CCProgressTimer.m
	libs/cocos2d/CCProtocols.h
	libs/cocos2d/CCRenderTexture.h
	libs/cocos2d/CCRibbon.h
	libs/cocos2d/CCRibbon.m
	libs/cocos2d/CCScene.h
	libs/cocos2d/CCScene.m
	libs/cocos2d/CCScheduler.h
	libs/cocos2d/CCScheduler.m
	libs/cocos2d/CCSprite.h
	libs/cocos2d/CCSprite.m
	libs/cocos2d/CCSpriteBatchNode.h
	libs/cocos2d/CCSpriteBatchNode.m
	libs/cocos2d/CCSpriteFrame.h
	libs/cocos2d/CCSpriteFrame.m
	libs/cocos2d/CCSpriteFrameCache.h
	libs/cocos2d/CCSpriteFrameCache.m
	libs/cocos2d/CCTMXLayer.h
	libs/cocos2d/CCTMXLayer.m
	libs/cocos2d/CCTMXObjectGroup.h
	libs/cocos2d/CCTMXObjectGroup.m
	libs/cocos2d/CCTMXTiledMap.h
	libs/cocos2d/CCTMXTiledMap.m
	libs/cocos2d/CCTMXXMLParser.h
	libs/cocos2d/CCTMXXMLParser.m
	libs/cocos2d/CCTexture2D.h
	libs/cocos2d/CCTextureAtlas.h
	libs/cocos2d/CCTextureAtlas.m
	libs/cocos2d/CCTextureCache.h
	libs/cocos2d/CCTextureCache.m
	libs/cocos2d/CCTexturePVR.h
	libs/cocos2d/CCTexturePVR.m
	libs/cocos2d/CCTileMapAtlas.h
	libs/cocos2d/CCTileMapAtlas.m
	libs/cocos2d/CCTransition.h
	libs/cocos2d/CCTransition.m
	libs/cocos2d/CCTransitionPageTurn.h
	libs/cocos2d/CCTransitionPageTurn.m
	libs/cocos2d/CCTransitionRadial.h
	libs/cocos2d/CCTransitionRadial.m
	libs/cocos2d/Platforms/CCGL.h
	libs/cocos2d/Platforms/CCNS.h
	libs/cocos2d/Platforms/Mac/CCDirectorMac.h
	libs/cocos2d/Platforms/Mac/CCEventDispatcher.h
	libs/cocos2d/Platforms/Mac/CCEventDispatcher.m
	libs/cocos2d/Platforms/Mac/MacGLView.h
	libs/cocos2d/Platforms/iOS/CCDirectorIOS.h
	libs/cocos2d/Platforms/iOS/CCDirectorIOS.m
	libs/cocos2d/Platforms/iOS/CCTouchDelegateProtocol.h
	libs/cocos2d/Platforms/iOS/CCTouchHandler.h
	libs/cocos2d/Platforms/iOS/CCTouchHandler.m
	libs/cocos2d/Platforms/iOS/EAGLView.h
	libs/cocos2d/Platforms/iOS/EAGLView.m
	libs/cocos2d/Platforms/iOS/ES1Renderer.h
	libs/cocos2d/Platforms/iOS/ESRenderer.h
	libs/cocos2d/Platforms/iOS/glu.c
	libs/cocos2d/Platforms/iOS/glu.h
	libs/cocos2d/Support/CCArray.h
	libs/cocos2d/Support/CCProfiling.h
	libs/cocos2d/Support/CCProfiling.m
	libs/cocos2d/Support/CGPointExtension.h
	libs/cocos2d/Support/CGPointExtension.m
	libs/cocos2d/Support/OpenGL_Internal.h
	libs/cocos2d/Support/TGAlib.h
	libs/cocos2d/Support/TGAlib.m
	libs/cocos2d/Support/TransformUtils.h
	libs/cocos2d/Support/TransformUtils.m
	libs/cocos2d/Support/base64.c
	libs/cocos2d/Support/base64.h
	libs/cocos2d/Support/ccCArray.h
	libs/cocos2d/Support/ccUtils.c
	libs/cocos2d/Support/ccUtils.h
	libs/cocos2d/Support/uthash.h
	libs/cocos2d/Support/utlist.h
	libs/cocos2d/ccConfig.h
	libs/cocos2d/ccMacros.h
	libs/cocos2d/ccTypes.h
	libs/cocos2d/cocos2d.h
	libs/cocos2d/cocos2d.m
Merge branch 'develop' of https://github.com/zasadnyy/splellcast_untittled into develop
ui state commit