Merge branch 'julie' into default
Added a bit more inside the database.
Update manual
Update populate database
Merge branch 'default' into julie