fixed the iap test bug
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #523 from wuzhiming/master2

fixed the iapTest bugs
Merge pull request #525 from pandamicro/master

Fixed #3547: Correctly recognize Mac OSX as a desktop platform
Fixed #5634: Support EventListenerMouse in JSB
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js