Clean manager license and users
Added support for upload
Merge branch 'clean' into new
Merge branch 'upload' into new
Merged clean and upload to new