optimize gui reader
Merge branch 'master' into master_nutty_modify_version
fix tween effect
fix reading CCSpriteFrame crash
optimize layout
remove useless codes
Modify "setLayoutParameter" method
Merge pull request #3927 from nutty898/master_nutty_optimizelayout

Master nutty optimizelayout
1.Add removeDisplay method
2.Add Armature Nesting Test 2
3.Remove unused code in CCDisplayFactory.cpp
upload resource
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed #2887 fix Dragon.xml
update Armature Nesting Test 2
Merge pull request #3944 from 2youyouo2/master

update armature
Merge remote-tracking branch 'upstream/master' into pride2