Conflicts:
	.gitignore
	analysis/functions.py
	gargantext_web/views.py
	init/README.rst
	init/dependances.sh
	init/requirements.txt
	templates/corpus.html
	templates/matrix.html