Updated submodules with NonConsumableItem migration
adding dialog options in profile JSB
Merge branch 'cocos2dx-v2' into cocos2dx-v2-jandusoft

Conflicts:
	development/submodules/ios-store