例行更新
Merge branch 'library' of https://github.com/redw/myproject into library

Conflicts:
	bin/game.swf
	obj/gameConfig.old
	obj/gameConfig.xml
	src/com/honghong/component/BaseButton.as
	src/com/honghong/component/Button.as
	src/com/honghong/component/core/SkinBox.as