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
Remove boxlayout
FS-10 start
FS-1 FS-2 Added userfeedback for login and register
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-2 Added tests for serverconnector login and register
FS-2 added tests for login and registration with ioexceptions
FS-1 FS-2: Codereview
FS-1 FS-2: Review ServerConnectorTest
Merge branch 'master' into loginscreen

Conflicts:
	src/main/java/org/fides/client/App.java
Merge branch 'loginscreen' into FS-2

Conflicts:
	src/main/java/org/fides/client/App.java
	src/main/java/org/fides/client/connector/ServerConnector.java
FS-1 FS-2 cleanup login/register screen, fixed fileutil
FS-10 Logging, FileSystem listener, needs more check