Merge branch 'mchinensedit'
Merge remote-tracking branch 'upstream/master'
Fixed linebreaks on Mac OSX
Merge pull request #2647 from dumganhar/master

Merge branch 'develop'
CCTextureAtlas::updateQuad modify for the memcpy hot spot

change the place that call CCTextureAtlas::updateQuad method to
update the quads with pointer reference directly.

Signed-off-by: Yongqin Liu<liuyq0307@thundersoft.com>
Merge pull request #2655 from minggo/ETC1-support

Support ETC1 format on Android
Merge pull request #2660 from minggo/ETC1-support

modify ORGANIZATIONNAME
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #2662 from CocosRobot/updategeneratedsubmodule_1369737138

[AUTO] : updating submodule reference to latest autogenerated bindings
CCConfiguration has format

CCconfiguration has a file format.
It has a data and metadata
CCLabelAtlas.cpp: add check for n when call setDirty

in CCLabelAtlas::updateAtlasValues, there is the case that n equal to 0,
so we need to check it before when call m_pTextureAtlas->setDirty(true) and do
other process.

Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
Merge pull request #2667 from ricardoquesada/configuration_format_2

CCConfiguration has format
Add out of bound check for the index before do the update

Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
Fixed tabbing.
Adds support for "CCString" types for boolean and integers
Fix the bug for the bound check

Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
Merge pull request #2672 from ricardoquesada/configuration_get_value_fix

Adds support for "CCString" types for boolean and integers
Revert the CCSprite.cpp and CCSprite.h to first merge other changes

Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
Merge pull request #2652 from liuyq/memcpy

CCTextureAtlas::updateQuad modify for the memcpy hot spot
Merge branch 'ForReflection'

Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm