Windob gitignore
mise a jour design
Merge branch 'master' of https://github.com/matthieuHanne/epi

Conflicts:
	Symfony/src/Epi/BoutiqueBundle/Resources/views/Default/boutique.html.twig