updated website
Merge remote-tracking branch 'upstream/master' into chinese

Conflicts:
	html/templates/api/Rex.pm.html.ep
	html/templates/api/Rex/Commands/File.pm.html.ep
	html/templates/api/Rex/FS/File.pm.html.ep
	html/templates/api/index.html.ep
	html/templates/howtos/compatibility.html.ep
	html/templates/howtos/index.html.ep
	html/website.pl