FS-1 FS-2 fixed review comments and added bad weather test
FS-1 FS-2 fixed fileutil, changed login/register
Ignore users folder
FS-1 FS-2 Updated common strings to static final strings
Merge branch 'FS-2' of https://github.com/Fides-Storage/Server into FS-2
fix gitignore
FS-1 FS-2: Codereview and changes for our protocol
Merge branch 'FS-2'
remove user file
remove tmp file
Merge branch 'master' into FS-24_-_File_request

Conflicts:
	src/main/java/org/fides/server/Client.java
	src/main/java/org/fides/server/files/UserManager.java
	src/test/java/org/fides/server/ClientTest.java