front
Merge branch 'Front_Camille' of https://github.com/gvergnaud/artfinder into front-in-work

Conflicts:
	app/index.html