Merge from Qian Long.
Merge branch 'master' of https://github.com/wanghong230/Ymeal

Conflicts:
	.DS_Store
Merge from Qian Long.
Merge branch 'master' of https://github.com/wanghong230/Ymeal

Conflicts:
	.DS_Store
Final From Hong Wang.