making marketPrice etc work and not return null
Merge branch 'master' into cocos2dx-v2

Conflicts:
	build/ios/libCocos2dXiOSStore.a
	build/ios/libSoomlaiOSStore.a
removing redundant files