Merge origin/master

Conflicts:
	partials/templates/territoire1/1.html
	partials/templates/territoire1/2.html