added *.DS_Store to .gitignore
Merge branch 'develop' into feature_o2dicompredicateeditor
added union to OSIROIMask
Merge branch 'develop' of http://github.com/pixmeo/osirix into feature_o2dicompredicateeditor
merge