Merge remote-tracking branch 'origin/video' into video

Conflicts:
	View/Articles/index.ctp