Commit to Ye.Branch for merge
Merge branch 'ye.branch' into staging.branch

Conflicts:
	Xue/.DS_Store
	Xue/res/.DS_Store