FS-12 Progress
Fs-12 Progress
FS-12 Progress, ready for making tests
FS-12 FileSyncManager test, small change to UserProperties and gitinore
FS-12 Unsaved changes
FS-10 start
FS-12: Codereview
FS-10 FS-12 tests and refactoring
Merge remote-tracking branch 'origin/FS-12' into FS-10

Conflicts:
	src/main/java/org/fides/client/files/FileManager.java
Merge branch 'master' into FS-10

Conflicts:
	src/main/java/org/fides/client/App.java
	src/main/java/org/fides/client/UserProperties.java
	src/main/java/org/fides/client/encryption/EncryptionManager.java
	src/main/java/org/fides/client/files/ClientFile.java
	src/main/java/org/fides/client/files/FileManager.java
	src/main/java/org/fides/client/files/FileUtil.java
	src/main/java/org/fides/client/files/InvalidClientFileException.java
	src/main/java/org/fides/client/files/KeyFile.java
FS-10 Logging, FileSystem listener, needs more check
FS-10 FS-12 ready for review
Fixed some EncryptionManager bugs
FS-10 review code
FS-10 FS-12 Review changes
FS-10 FS-12 cross platform fixes
FS-10 test change
FS-10 LocalFileChecker is made more reliable and more LocalHashes
FS-10 FS-12 review changes, also added to main
Ask for password for the encryption of files