energy_types table and jobEnergyTypeID field added
merge