Description.
Merge remote-tracking branch 'remotes/WorkingRepo/master'

Conflicts:
	youtune/fileupload/templates/fileupload/file_form.html
Upload form improvements.
Merge remote-tracking branch 'remotes/WorkingRepo/master'