Merge pull request #1 from mrubel92/master

Updated Userlist, groupthread, groupclient to support password and salt
Switched IDE to NetBeans. Lots of new warnings.

NetBeans offered a lot of new warnings which I addressed. Also switched to NetBeans formatting for all files.
Added password field to GUI
Password functionality
Diffie-Hellman exchange implemented.
Fully implemented DH between GS and client
Not working decryption/deserialization
Communication between GS and client is encrypted
File Server fingerprint exchance implemented
Encrypted upload and download
Signed tokens
Usage and compile instructions
Update usage.txt
Proposal pdf
Merge branch 'master' of https://github.com/tdoshea90/cs1653-3
Update compile.txt
Fixed getGroups bug for Token
phase 4 threat 5 changes