Added check to restorefile to see if file is null
Merge branch 'master' of https://github.com/Guntler/SDIS

Conflicts:
	SDIS proj1/src/pt/up/fe/backup/tasks/RestoreFileTask.java