update submodules
Merge branch 'master' of github.com:vedi/cocos2d-x

Conflicts:
	extensions/cocos2dx-store