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

Conflicts:
	bin/game.swf
	obj/gameConfig.xml