fix osx edit box
Merge branch '2.1.5-DOW' of https://github.com/daysofwonder/cocos2d-x into 2.1.5-DOW