copy changes from master
fix mistakes in generate.sh
run generate.sh
Merge branch 'clean2'

Conflicts:
	config/routes.rb
	db/schema.rb