Updating property in CCDictionary.
fixed #2129: Rename m_iVar to _var, remove CC prefixes.
Merge pull request #8 from cocos2d/develop

update cocos2d/cocos2d-x
update "fix a bug that SimpleAudioEngine may cause crash on i9100"
Template fix for iOS Template.
Fix a bug (https://github.com/cocos2d/cocos2d-x/pull/2902)
android target 17 --> 8.
[Windows] multi-platform-lua fix.
Merge pull request #2896 from dumganhar/iss2129-format-codes

issue #2129: New naming of member varibles, renaming m_iVar to _var.
Merge pull request #2902 from waiter/master

update "fix a bug that SimpleAudioEngine may cause crash on i9100"
Merge pull request #2903 from dumganhar/master

Template fixes for iOS and Windows
Add plugin Admob for iOS.
Add sample code for plugin admob on iOS.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge branch 'master' into develop

Conflicts:
	extensions/cocos-ext.h
Merge pull request #2909 from dumganhar/develop

Sync with master branch
Merge pull request #2908 from natural-law/develop

[PluginX] Add admob for iOS
fixed #2124: make CCImage::initWithIamgeFileThreadSafe() thread safe
Enable Hardware Acceleration.
Merge pull request #2916 from minggo/load-image-async

fixed #2124: make CCImage::initWithIamgeFileThreadSafe() thread safe