Manager update for file management
updated because David is CRAZY!
Merge remote-tracking branch 'origin/Temp-Manager' into Temp-Manager
Doesn't matter.
Merged temp-manager branch into master