Add $OriginalFolder flag to renamer (thx Begall)

Add $OriginalFolder flag to renamer (solved conflicts) #1699