Fix'd random stuff
Merge branch 'master' of https://github.com/Guntler/SDIS.git

Conflicts:
	SDIS proj1/src/pt/up/fe/backup/FileManager.java
	SDIS proj1/src/pt/up/fe/backup/SocketListener.java