Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox

...vascripts/components/components/extended_video_player.jsx

app/assets/javascripts/components/components/status.jsx

...assets/javascripts/components/components/video_player.jsx

...ts/javascripts/components/containers/status_container.jsx

...components/features/status/components/detailed_status.jsx

app/assets/javascripts/components/features/status/index.jsx

...scripts/components/features/ui/components/media_modal.jsx

...ascripts/components/features/ui/components/modal_root.jsx

...scripts/components/features/ui/components/video_modal.jsx

app/assets/javascripts/components/locales/en.jsx