chnages
final push
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/helpers/file_helper.rb
	app/models/assignment_participant.rb
	app/views/submitted_content/_submitted_files.html.erb