New modeling

Conflicts:
	db/schema.rb
indent