- master server side of device uploading

 - revert of temp commit