fix android keypad event.
fix typo
Merge pull request #400 from wland/master

fix android keypad event.
upgrade to 2.2.5
update player mac
minor update
update player win
Merge branch 'master' of https://github.com/chukong/quick-cocos2d-x

Conflicts:
	lib/cocos2d-x/scripting/lua/cocos2dx_support/LuaCocos2d.cpp