Merge branch 'hotfix/2.0.6'
Merge branch 'release/2.1.0'
Added: Media Attribute
Fixed: author
CS
Only allow valid file types in the selection
Merge branch 'feature/media-attribute' into develop
Updated changelog