Revert crazy commit

This reverts commit 61209ea0fe2975e377970236e848449b0bf6fd17.
Merge branch 'Joca'

Conflicts:
	RMIConnection.java
Added the option to go back to the main menu
Clean some fixmes
Code cleanup and Javadoc
Fix up RMI Connection
Fixing up last things
Removing more fixmes and making RMI server configurable
Some IntelliJ fixes
Javadoc ; Almost final commit
Ficheiros da base de dados
Merge branch 'master' of https://github.com/Jorl17/projecto-sd
Ficheiros da base de dados
Added stuff for the Database
Changed a file name
Added missing file to the repo
More changes to the database
Changes made to the Relational Data Model of the database
ER Diagram
Final commit for the day