Async load
Revert "Async load"

This reverts commit 55198771b985e6328af17b654fc435988a874158.
fix collider detector setActive
1. fix if stop armature animation, the collider detector not update
2. fix chipmunk calculate
Asynchronous loading of resources
Merge branch 'v2x' of git://github.com/chukong/cocos2d-x into v2x
Merge branch 'v2x' of git://github.com/2youyouo2/cocos2d-x into v2x

Conflicts:
	extensions/CCArmature/utils/CCArmatureDataManager.cpp
	extensions/CCArmature/utils/CCArmatureDataManager.h
	extensions/CCArmature/utils/CCDataReaderHelper.cpp
	extensions/CCArmature/utils/CCDataReaderHelper.h
Merge pull request #22 from 2youyouo2/v2x

update armature