test upload to tmp from warehouse via https
Updated jstree
Merge branch 'master' of https://github.com/amd/rest3d

Conflicts:
	server/src/warehouse.js
Fixed 'undefined' path for warehouse unzipping