Fixed bug where empty groups would crash graph2d, cleaned code
Merge remote-tracking branch 'origin/develop' into develop