Merge pull request #473 from graeme-f/master

Adding demo data & a few minor bug fixes in the default template.
Add special prepop function to import images (such as an org logo)