Synching with last round of changes
Merge branch 'master' of https://github.com/OpenSextant/opensextant
Commented out time consuming "resolveOverlaps"