Split P1 into Electicity and Gas, added generic sensor for today's gas usage