Miscellaneous changes
Merge remote-tracking branch 'origin/master'

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