fixed demosite db prefixes
fixed deprecated for generate commands
Merge remote-tracking branch 'origin/generator_deprecated_fix'