Added a more stuff, started work on file manager
Merge branch 'master' of https://github.com/Guntler/SDIS

Conflicts:
	SDIS proj1/src/pt/up/fe/backup/TaskManager.java
	SDIS proj1/src/pt/up/fe/backup/tasks/Task.java
Changed some stuff that had gotten wrong during the merge