A commented out block for testing code to be put
Deleting ideas; checking id ideas have children
Merge branch 'master' of https://github.com/Jorl17/projecto-sd

Conflicts:
	Common.java
	ServerClient.java
Remove *.orig...
Support for relogging when the server fails. Support for one-retry.
Implementing and using a ConnectionPool
Now we only have ONE connection to the RMI server. All managed by RMIConnection
Merge remote-tracking branch 'origin/Joca'

Conflicts:
	Common.java
	ServerClient.java
Corrected bug in the transaction history
Added the new table to the database for mapping files to ideas
Changed the account settings menu. Now it shows the user ideas when you enter it. Still work in progress
Adding basic pinging mechanism to server; now we track if we're primary or secondary
Notifying client if we're primary or secondary, and dealing with it (LEFT TO TEST WHAT HAPPENS WHEN WE'RE SECONDARY!)
Cleaning up Messages, getting them ordered and one by line (Joca, check out the fixmes!)
Merge branch 'master' of https://github.com/Jorl17/projecto-sd

Conflicts:
	Common.java
Removing merge leftovers…Dang, can never get it right!
Dealing with transient faults in UDP Receiver (we use a retry-once mechanism)
Largely Untested ground for the RequestQueue. JOCA, LÊ ISTO!!
Modify the RequestQueue to allow for generic requests (not just queries) as well as generic request returns (not just strings)
Already fixed FIXME