Ensure that the correct demo data is installed to a working system
Fix the initial DB name
Merge pull request #358 from timschofield/develop

Develop