wing学习

wing学习
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/egretProjects/HelloGUI/.idea/workspace.xml
	trunk/egretProjects/HelloGUI/src/skins/components/BittonSkin.exml