Update demo db and define admin password
Merge remote-tracking branch 'upstream/master'