Fixed the arrows in iframe popup
Merge remote-tracking branch 'origin/video' into video

Conflicts:
	webroot/css/style.css