Bug fixes and changes to the local file handling
Merge branch 'master' of https://github.com/Fides-Storage/Client

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