Progression sur le cas d'utilisation F4
Merge branch 'master' of https://github.com/nabilbouab/shipping

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