Merge branch 'develop' into renaming-48027353
Merge branch 'develop' into renaming-48027353
Started working on the contextMenu for the outlets
Changed the names of the functions to be called when name changes or grouping outlets
Created the renaming and grouping methods
cleared old code to make room for api branch
added datastructure stats, added jsonparsing
Stats constructor fixed
Using correct class Consumption
fixed callback
Fixed merge conflicts when merging statistics into develop.
Fixed merge conflicts when merging renaming into develop.