modifs
Merge branch 'master' of https://github.com/p117/confiture

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