FS-12: Codereview
Merge remote-tracking branch 'origin/FS-12' into FS-10

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