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

Conflicts:
	cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
	extensions/cocos2dx-store
add sharekit to Share module