Rework file entity view modes to fix render issues for Medium in Wysiwyg.
Merge branch 'feature/195'
Module: Tag Manager.
Added Term Merge.
Merge branch 'feature/139'
Merge commit 'ed1bcd4d26dde5cdfae5d5828984cca880430723'