Merge branch 'master' into FS-21_FS-22
FS-21 FS-22 Hashes for username
FS-21 FS-22 Encrypting userfile
FS-21 FS-22 Encryption/Decryption for userfile
FS-21 FS-22 changed some javadoc
FS-21 FS-22 modified javadoc
Revert "FS-21 FS-22 modified javadoc"

This reverts commit 81be048e0d25e65a866bd0a88ac01c01cdaeddf5.
FS-21 FS-22 formatted code
Started moving login and regsiter to UserManager
FS-21 FS-22 Moved SALT_SIZE back
Merge branch 'FS-21_FS-22'
Fixed username hash and use properties manager and move hex to utiland check auto login and
Moved login and register to UserManager, put all error and successful returns to CommunicationUtil
Merge branch 'master' into Random_Fixes

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
	src/test/java/org/fides/server/files/UserManagerTest.java
Merge branch 'Random_Fixes'
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