Fixed user prepopulation in the database
Merge remote-tracking branch 'sourcefabric/master' into devel
Merge remote-tracking branch 'sourcefabric/devel' into aap