Merge webgis/master

Conflicts:
	test5.php