ok
Merge branch 'master' of https://github.com/anhcuongone/share-video

Conflicts:
	protected/views/admin/video/index.php