Merge branch 'master' of github.com:fengjingchao/video_cdn

Conflicts:
	.gitignore