Add deferred loading of media explorer data for #123.
Fix media source loading for demo #123.
Merge remote-tracking branch 'template/issue123'