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
Update init.lua

update cc.VERSION = "2.2.5"
Merge pull request #1 from chukong/master

upd 2.5.5
add api : device.vibrate()
Merge pull request #407 from wland/master

add api : device.vibrate()
Merge pull request #403 from skyblue/patch-1

Update init.lua
rename cc.Sprite.getColor() to cc.Sprite.getColorAtPoint(), avoid override CCSprite::getColor()
Merge branch 'develop'

Conflicts:
	lib/cocos2d-x/scripting/lua/cocos2dx_support/LuaCocos2d.cpp
	lib/framework_precompiled/framework_precompiled.zip
	player/mac/player.app/Contents/MacOS/player
	player/proj.mac/player.xcodeproj/project.pbxproj
	samples/chukong_ad/res/framework_precompiled.zip
	samples/cocopush/res/framework_precompiled.zip
	samples/iap4ios/res/framework_precompiled.zip
	samples/luajavabridge/res/framework_precompiled.zip
	samples/touch/res/framework_precompiled.zip
	samples/umeng_analytics/res/framework_precompiled.zip
	samples/umeng_feedback/res/framework_precompiled.zip
	samples/umeng_push/res/framework_precompiled.zip
	samples/umeng_share/res/framework_precompiled.zip
	samples/umeng_update/res/framework_precompiled.zip
	template/PROJECT_TEMPLATE_01/res/framework_precompiled.zip
update framework zip
update luabinding
update player mac
update player win