Improved tree traversal towards non-afms
Merge branch 'develop' of https://github.com/gsdlab/ClaferToolsUICommonPlatform into develop