忽略文件workspace
Merge remote-tracking branch 'origin/master'

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