Timeout for DICOMDIR reading
Merge branch 'develop' of https://github.com/pixmeo/osirix into develop

Conflicts:
	DicomDirParser.m