Merge origin/dev_desktop into dev_desktop

Conflicts:
	static/site-desktop/section_home/css/css/style.css