All Inclusive Pricing (#209) and Combined Energy and Power Pricing (#208)
Merge branch 'pricing' into develop