updated from header next-l/enju_leaf#257

Conflicts:
	Gemfile
	spec/dummy/db/schema.rb