testing qt
Merge branch 'feature/new_gui' into develop