FS-21 FS-22 added hashes on client
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 changed some javadoc
FS-21 FS-22 modified javadoc
FS-21 FS-22 Moved SALT_SIZE back
Merge branch 'FS-21_FS-22'