Forbiden glsl file moves when converting
Touch
Added feature for uploading from warehouse to project
Touch
Touch
Touch
Touch
Merge branch 'master' of https://github.com/amd/rest3d
Upload/convert is now redirect to project tree. Model are now removable from scene tree
Touch
Touch
Touch
Merge branch 'master' of https://github.com/amd/rest3d

Conflicts:
	server/package.json
	server/src/fileinfo.js
Touch
Touch
Touch
Touch
Touch
Touch
Touch