Merge branch 'master' of https://github.com/t20100/pymca
GL: Add active curve handling
Fix activeCurve z handling and reset activeCurve when disabled
Merge remote-tracking branch 'upstream/master'