updated generator

Conflicts:
	app/models/circulation_status.rb