kcal values for commodity type.
Outputting first gen bioenergy demand.
adjust prices passed to demand in similar terms to G&G model.

fix to incorporate seed and waste losses into production passed from GAMS to Java, incl change to fbs method. Outputting demand for Frances and hacky code for Trump stuff.

Tidy up 'TRADE_BARRIER_MULTIPLIER' remove S on end to keep consistent and change initial price values