Merge origin/master

Conflicts:
	SitoIUM/js/x3dresources.js