Fix for null mimetypes in os_files alter #3513

Made sure to check if a mimetype was null before array merging it.  When they are empty, use the array we would have merged with.
Merge branch 'SCHOLAR-3.x' into 3513-os_files_null_merge

Conflicts:
	openscholar/modules/os/modules/os_files/os_files.module
Merge branch 'SCHOLAR-3.x' into 3513-os_files_null_merge

Conflicts:
	openscholar/modules/os/modules/os_files/os_files.module
Merge branch 'SCHOLAR-3.x' into 3513-os_files_null_merge
Fixed typo leftover from merge #3513
More files qa #4502

Full view doesn't show title and icon when they're redundant with a preview that's already there.
SV list updates #2033

Video teasers have a smaller thumbnail.  Video and image teasers list the file before the file info div.  All sv lists add a css class describing the list's entity, bundle, and view mode (this was needed for the smaller thumbnail.)
Merge pull request #4690 from openscholar/4502-lof_qa

More files qa #4502
Merge branch 'SCHOLAR-3.x' into 2033-lof_final
Merge pull request #4647 from openscholar/4636-2

VSite roles & permissions
Merge pull request #3539 from openscholar/3513-os_files_null_merge

3513 os files null merge
Don't alter render array for html files.  #2033
os files. new icons. updated css.#2033
Merge branch '2033-lof_final' of github.com:openscholar/openscholar into 2033-lof_final

Conflicts:
	openscholar/themes/os_basetheme/css/global.base.css
remove float right now download link in teaser view/sidebar. was breaking. #2033
File teasers w/ descrioptions gain read more link #2033
Merge branch '2033-lof_final' of github.com:openscholar/openscholar into 2033-lof_final
Merge branch 'SCHOLAR-3.x' into 2033-lof_final
LOF with full display shows links to file/fid #2033

Originally I treated this as an exception.  All the content is in the list, so there's nothing to be gained by having a link to the file page which has no useful content.  Except that the file page is useful to link to.  Someone wanting to link to one of many files needs that link.  Now title/download is on all the modes - no more exception for full view mode.
Embedded audio files are embedded in full view #2033