edit main_content8
Merge remote-tracking branch 'origin/cherchelafam' into cherchelafam

Conflicts:
	build/js/main.min.js
	build/js/main.min.map
	build/views.js
edit main_content8