media resources
Merge branch 'features/sidebar' into dev