Removed superfluous code
Merge remote-tracking branch 'origin/master' into GUI
Fixed Crypto compilation and UI PLZ READ NOTES

So the UI can now connect to any server on any port. Connecting to
javalab must be done from WITHIN JAVALAB
Merge remote-tracking branch 'origin/master' into GUI