egret学习

egret学习
Merge branch 'master' of https://github.com/junlas/soeasy

Conflicts:
	trunk/egretProjects/HelloGUI/.idea/workspace.xml