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

Conflicts:
	src/com/honghong/component/Window.as