Merge gbDevelop and hoaViz branches