Merge remote-tracking branch 'origin/doogee323'

Conflicts:
	tz.sheepshare/spy.log
ddd
Merge branch 'master' of https://github.com/doohee323/tz.sheepshare.git
1111