fixed AESCrypt exception
Merge branch 'master' of https://github.com/bjacklyn/seng426 into aescryptFix
Merge pull request #5 from bjacklyn/aescryptFix

Aescrypt fix
Remove JOptionPanes from server side
Merge pull request #6 from bjacklyn/bjacklynServerSideBugs

Remove JOptionPanes from server side
Make DigitialCertificateIO methods static on server side
Fix DigitalCertificateIO bugs
Merge pull request #7 from bjacklyn/bjacklynClientSideBugs

Bjacklyn client side bugs
Add try-catch blocks for ioexceptions and classnotfoundexceptions on server side:
Merge pull request #8 from bjacklyn/bjacklynServerSideBugs

Add try-catch blocks for ioexceptions and classnotfoundexceptions on ser...
Merge branch 'master' into p2pTimeout

Conflicts:
	The e-Cheque Client/src/eCheque/RegistrationJFrame.java