FS-23: Added the removing
Merge branch 'ServerBranch' of https://github.com/Fides-Storage/Server into ServerBranch

Conflicts:
	src/main/java/org/fides/server/files/FileManager.java