FS-28: Changed protocol on server side.
Merge branch 'master' into FS-28_Concurrency

Conflicts:
	src/main/java/org/fides/server/Client.java
FS-28: Added a 'disconnect' option when waiting for a login or register.
The filemanager now has the ability to create files ending with .tmp
Merge branch 'FS-28_Concurrency' of https://github.com/Fides-Storage/Server into FS-28_Concurrency
FS-28: Some cleaning of the server.
Documentation
Removed unnecessary logging of closed sockets.
FS-28: Made sure the temporary files get removed when an upload or update fails.
Moved the Server Started logs to the correct spot.
FS-28 bug fix, removed double succesful confermation
FS-28: Added a lock to the user to prevent a user getting editted from multiple clients at the same time.
Merge branch 'FS-28_Concurrency' of https://github.com/Fides-Storage/Server into FS-28_Concurrency
FS-28: Added some documentation and removed some temporary logging.
FS-28: Added tests for the UserLocker.
Merge branch 'master' into FS-28_Concurrency

Conflicts:
	src/main/java/org/fides/server/Client.java
	src/main/java/org/fides/server/ClientFileConnector.java
	src/main/java/org/fides/server/files/FileManager.java
	src/main/java/org/fides/server/files/UserManager.java
Merge remote-tracking branch 'origin/FS-28_Concurrency' into FS-28_Concurrency
FS-28: Made the UserLocker a bit more stable.
FS-28 Review and some minor changes (Null-checks / javadoc)
FS-28 Added nullcheck and removed unused imports
FS-50 Added error message when user is locked