Fixed #3547: Correctly recognize Mac OSX as a desktop platform
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Fixed #3547: Remove touch capability on Mac and log
Merge pull request #525 from pandamicro/master

Fixed #3547: Correctly recognize Mac OSX as a desktop platform