Add generic name and image to demo content.
Merge branch 'tutorial'