1
Merge branches 'master' and 'master' of https://github.com/zhaonana/LoveAnchor

Conflicts:
	LoveAnchor/PlayViewController.m