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
FS-21 FS-22 Moved SALT_SIZE back
Merge branch 'FS-21_FS-22'