Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	f/css/main.css
	f/i/icons.png
	index5.html
	index6.html
Debug