asset manager crash fix
Merge branch 'master' of github.com:sburavtsov/cocos2d-x

Conflicts:
	extensions/AssetsManager/AssetsManager.cpp