fixes #4454
Merge pull request #26 from chengstory/#4454

fixes #4454
Merge pull request #27 from 2youyouo2/v2x

update armature
1. change CCJsonReader to CCSSceneReader.
2. add default playing music.
1. revert GUI Samples.
1. change multi-platform makefile.
Merge pull request #28 from chengstory/#4508

#4508
Merge branch 'v2x' of git://github.com/chukong/cocos2d-x into v2x

Conflicts:
	samples/Cpp/TestCpp/Classes/ExtensionsTest/SceneEditorTest/SceneEditorTestScene.cpp