added: dev generator (mockup)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/utils/generator.js