merge conflict
Merge branch 'feature/ui-graphics_view-48' of https://github.com/PaulSchweizer/AutoRigger into feature/ui-graphics_view-48