touch
fixing require stuff
Merge branch 'master' of https://github.com/amd/rest3d

Conflicts:
	static/viewer/viewer6.html