ttools: refactor, put PlaneAxisAnnotation in its own class.
Merge remote-tracking branch 'origin/master'