FS-28: Changed protocol on cliënt side.
Merge errors fixed
Merge branch 'master' into FS-28_Concurrency

Conflicts:
	src/main/java/org/fides/client/connector/ServerConnector.java
	src/main/java/org/fides/client/files/FileSyncManager.java
FS-28 FileSyncManager ServerConnector use change
FS-28 change the order in which the FileSyncManager talks with the server
Authenticate user password confirm fixed, when it is hidden it is emptied
FS-28: Fixed uploading the first keyfile
FS-28: Removed an unnecessary close to prevent the upload from failing.
FS-28 hash saving, bug fix
Removed and added some logs
Merge branch 'FS-28_Concurrency' of https://github.com/Fides-Storage/Client into FS-28_Concurrency
FS-28 ServerConnector disconnect message
FS-28: Made the login-check before every function in ServerConnector more stable.
FS-28 return false instead of NullPointerException
FS-28 debug functions
KeyGenerator change, made a variable final which should not be changed also a small space added
FS-28 removed some useless logs
Merge branch 'master' into FS-28_Concurrency

Conflicts:
	src/main/java/org/fides/client/connector/ServerConnector.java
	src/main/java/org/fides/client/encryption/EncryptionManager.java
	src/main/java/org/fides/client/encryption/KeyGenerator.java
	src/main/java/org/fides/client/files/FileSyncManager.java
	src/main/java/org/fides/client/files/LocalFileChecker.java
	src/main/java/org/fides/client/ui/AuthenticateUser.java
FS-28 Fixed mis-merge, saved inetaddress was not stored
FS-54 removing of maps recursively