asasa
Merge branch '0616' of https://github.com/Linyuyu/YuYuDemo into Bug1

Conflicts:
	改版 log