Task, Flash, Attachment, Video
Merge branch 'master' of https://github.com/dimavt/IT-University

Conflicts:
	cmp/Video/vw/upload_dlg.php