Merge branch 'mchinensedit'
Merge remote-tracking branch 'upstream/master'
Merge branch 'develop' of https://github.com/simpliplant/cocos2d-x into simp
set up keyboard handling for mac
Merge pull request #5 from mchinen/simpfix

Merge keyboard support for mac by @mchinen